Use new, preferred METADATA macros.

Bug: 1485768
Change-Id: I75ce714fdde26e495e40c35db6a043d16ef2120b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5253906
Reviewed-by: Trent Apted (tapted@chromium) <tapted@chromium.org>
Commit-Queue: Allen Bauer <kylixrd@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1255343}

apps/ui/views/app_window_frame_view.cc

@@ -406,7 +406,7 @@ void AppWindowFrameView::SetButtonImagesForFrame() {
   }
 }
 
-BEGIN_METADATA(AppWindowFrameView, views::NonClientFrameView)
+BEGIN_METADATA(AppWindowFrameView)
 END_METADATA
 
 }  // namespace apps

apps/ui/views/app_window_frame_view.h

@@ -30,9 +30,9 @@ namespace apps {
 
 // A frameless or non-Ash, non-panel NonClientFrameView for app windows.
 class AppWindowFrameView : public views::NonClientFrameView {
- public:
-  METADATA_HEADER(AppWindowFrameView);
+  METADATA_HEADER(AppWindowFrameView, views::NonClientFrameView)
 
+ public:
   // AppWindowFrameView is used to draw frames for app windows when a non
   // standard frame is needed. This occurs if there is no frame needed, or if
   // there is a frame color.

ash/ambient/ui/ambient_animation_view.cc

@@ -454,7 +454,7 @@ JitterCalculator* AmbientAnimationView::GetJitterCalculatorForTesting() {
   return &animation_jitter_calculator_;
 }
 
-BEGIN_METADATA(AmbientAnimationView, views::View)
+BEGIN_METADATA(AmbientAnimationView)
 END_METADATA
 
 }  // namespace ash

ash/ambient/ui/ambient_animation_view.h

@@ -45,9 +45,9 @@ class ASH_EXPORT AmbientAnimationView : public views::View,
                                         public views::ViewObserver,
                                         public GlanceableInfoView::Delegate,
                                         public MediaStringView::Delegate {
- public:
-  METADATA_HEADER(AmbientAnimationView);
+  METADATA_HEADER(AmbientAnimationView, views::View)
 
+ public:
   AmbientAnimationView(
       AmbientViewDelegateImpl* view_delegate,
       AmbientAnimationProgressTracker* progress_tracker,

ash/ambient/ui/ambient_background_image_view.cc

@@ -316,7 +316,7 @@ bool AmbientBackgroundImageView::HasPairedImages() const {
   return !image_unscaled_.isNull() && !related_image_unscaled_.isNull();
 }
 
-BEGIN_METADATA(AmbientBackgroundImageView, views::View)
+BEGIN_METADATA(AmbientBackgroundImageView)
 END_METADATA
 
 }  // namespace ash

ash/ambient/ui/ambient_background_image_view.h

@@ -27,9 +27,9 @@ namespace ash {
 // interacts with the background photos.
 class ASH_EXPORT AmbientBackgroundImageView : public views::View,
                                               public views::ViewObserver {
- public:
-  METADATA_HEADER(AmbientBackgroundImageView);
+  METADATA_HEADER(AmbientBackgroundImageView, views::View)
 
+ public:
   explicit AmbientBackgroundImageView(AmbientViewDelegate* delegate);
   AmbientBackgroundImageView(const AmbientBackgroundImageView&) = delete;
   AmbientBackgroundImageView& operator=(const AmbientBackgroundImageView&) =

ash/ambient/ui/ambient_container_view.cc

@@ -42,7 +42,7 @@ void AmbientContainerView::InitializeCommonSettings() {
   SetLayoutManager(std::make_unique<views::FillLayout>());
 }
 
-BEGIN_METADATA(AmbientContainerView, views::View)
+BEGIN_METADATA(AmbientContainerView)
 END_METADATA
 
 }  // namespace ash

ash/ambient/ui/ambient_container_view.h

@@ -21,9 +21,9 @@ class AmbientOrientationMetricsRecorder;
 // Container view to display all Ambient Mode related views, i.e. photo frame,
 // weather info.
 class ASH_EXPORT AmbientContainerView : public views::View {
- public:
-  METADATA_HEADER(AmbientContainerView);
+  METADATA_HEADER(AmbientContainerView, views::View)
 
+ public:
   // |main_rendering_view| should contain the primary content; it becomes a
   // child of |AmbientContainerView|, and |AmbientContainerView| sets up some
   // parameters in the view hierarchy that are common to all ambient UIs.

ash/ambient/ui/ambient_info_view.cc

@@ -131,7 +131,7 @@ GlanceableInfoView* AmbientInfoView::GetGlanceableInfoViewForTesting() const {
   return glanceable_info_view_;
 }
 
-BEGIN_METADATA(AmbientInfoView, views::View)
+BEGIN_METADATA(AmbientInfoView)
 END_METADATA
 
 }  // namespace ash

ash/ambient/ui/ambient_info_view.h

@@ -26,9 +26,9 @@ class GlanceableInfoView;
 
 class ASH_EXPORT AmbientInfoView : public views::View,
                                    public GlanceableInfoView::Delegate {
- public:
-  METADATA_HEADER(AmbientInfoView);
+  METADATA_HEADER(AmbientInfoView, views::View)
 
+ public:
   explicit AmbientInfoView(AmbientViewDelegate* delegate);
   AmbientInfoView(const AmbientInfoView&) = delete;
   AmbientInfoView& operator=(AmbientInfoView&) = delete;

ash/ambient/ui/ambient_shield_view.cc

@@ -127,7 +127,7 @@ void AmbientShieldView::InitLayout() {
       GradientBackground::Orientation::kVertical, colors));
 }
 
-BEGIN_METADATA(AmbientShieldView, views::View)
+BEGIN_METADATA(AmbientShieldView)
 END_METADATA
 
 }  // namespace ash

ash/ambient/ui/ambient_shield_view.h

@@ -11,9 +11,9 @@
 namespace ash {
 
 class AmbientShieldView : public views::View {
- public:
-  METADATA_HEADER(AmbientShieldView);
+  METADATA_HEADER(AmbientShieldView, views::View)
 
+ public:
   AmbientShieldView();
   AmbientShieldView(const AmbientShieldView&) = delete;
   AmbientShieldView& operator=(const AmbientShieldView&) = delete;

ash/ambient/ui/ambient_slideshow_peripheral_ui.cc

@@ -119,7 +119,7 @@ void AmbientSlideshowPeripheralUi::UpdateImageDetails(
   ambient_info_view_->UpdateImageDetails(details, related_details);
 }
 
-BEGIN_METADATA(AmbientSlideshowPeripheralUi, views::View)
+BEGIN_METADATA(AmbientSlideshowPeripheralUi)
 END_METADATA
 
 }  // namespace ash

ash/ambient/ui/ambient_slideshow_peripheral_ui.h

@@ -25,9 +25,9 @@ class JitterCalculator;
 // weather and media string that are shown in the slideshow's photo view.
 class AmbientSlideshowPeripheralUi : public views::View,
                                      public MediaStringView::Delegate {
- public:
-  METADATA_HEADER(AmbientSlideshowPeripheralUi);
+  METADATA_HEADER(AmbientSlideshowPeripheralUi, views::View)
 
+ public:
   explicit AmbientSlideshowPeripheralUi(AmbientViewDelegate* delegate);
   ~AmbientSlideshowPeripheralUi() override;
 

ash/ambient/ui/glanceable_info_view.cc

@@ -216,7 +216,7 @@ int GlanceableInfoView::GetTimeFontDescent() {
   return GetFontDescent(GetTimeFontList(time_font_size_dip_));
 }
 
-BEGIN_METADATA(GlanceableInfoView, views::View)
+BEGIN_METADATA(GlanceableInfoView)
 END_METADATA
 
 }  // namespace ash

ash/ambient/ui/glanceable_info_view.h

@@ -27,6 +27,8 @@ class TimeView;
 // Container for displaying a glanceable clock and weather info.
 class ASH_EXPORT GlanceableInfoView : public views::View,
                                       public AmbientWeatherModelObserver {
+  METADATA_HEADER(GlanceableInfoView, views::View)
+
  public:
   class Delegate {
    public:
@@ -36,8 +38,6 @@ class ASH_EXPORT GlanceableInfoView : public views::View,
     virtual SkColor GetTimeTemperatureFontColor() = 0;
   };
 
-  METADATA_HEADER(GlanceableInfoView);
-
   GlanceableInfoView(
       AmbientViewDelegate* delegate,
       GlanceableInfoView::Delegate* glanceable_info_view_delegate,

ash/ambient/ui/media_string_view.cc

@@ -310,7 +310,7 @@ void MediaStringView::StartScrolling(bool is_initial) {
   }
 }
 
-BEGIN_METADATA(MediaStringView, views::View)
+BEGIN_METADATA(MediaStringView)
 END_METADATA
 
 }  // namespace ash

ash/ambient/ui/media_string_view.h

@@ -31,6 +31,8 @@ class MediaStringView : public views::View,
                         public views::ViewObserver,
                         public media_session::mojom::MediaControllerObserver,
                         public ui::ImplicitAnimationObserver {
+  METADATA_HEADER(MediaStringView, views::View)
+
  public:
   struct Settings {
     SkColor icon_light_mode_color;
@@ -48,8 +50,6 @@ class MediaStringView : public views::View,
     virtual Settings GetSettings() = 0;
   };
 
-  METADATA_HEADER(MediaStringView);
-
   explicit MediaStringView(MediaStringView::Delegate* delegate);
   MediaStringView(const MediaStringView&) = delete;
   MediaStringView& operator=(const MediaStringView&) = delete;

ash/ambient/ui/photo_view.cc

@@ -180,7 +180,7 @@ gfx::ImageSkia PhotoView::GetVisibleImageForTesting() {
   return image_views_.at(image_index_)->GetCurrentImage();
 }
 
-BEGIN_METADATA(PhotoView, views::View)
+BEGIN_METADATA(PhotoView)
 END_METADATA
 
 }  // namespace ash

ash/ambient/ui/photo_view.h

@@ -38,9 +38,9 @@ struct ASH_EXPORT PhotoViewConfig {
 class ASH_EXPORT PhotoView : public views::View,
                              public AmbientBackendModelObserver,
                              public ui::ImplicitAnimationObserver {
- public:
-  METADATA_HEADER(PhotoView);
+  METADATA_HEADER(PhotoView, views::View)
 
+ public:
   explicit PhotoView(AmbientViewDelegateImpl* delegate,
                      PhotoViewConfig view_config = PhotoViewConfig());
 

ash/app_list/views/app_list_bubble_apps_page.cc

@@ -983,7 +983,7 @@ void AppListBubbleAppsPage::OnToggleContinueSection() {
   }
 }
 
-BEGIN_METADATA(AppListBubbleAppsPage, views::View)
+BEGIN_METADATA(AppListBubbleAppsPage)
 END_METADATA
 
 }  // namespace ash

ash/app_list/views/app_list_bubble_apps_page.h

@@ -61,9 +61,9 @@ class ASH_EXPORT AppListBubbleAppsPage
       public AppListModelProvider::Observer,
       public AppListToastContainerView::Delegate,
       public AppListViewProvider {
- public:
-  METADATA_HEADER(AppListBubbleAppsPage);
+  METADATA_HEADER(AppListBubbleAppsPage, views::View)
 
+ public:
   AppListBubbleAppsPage(AppListViewDelegate* view_delegate,
                         ApplicationDragAndDropHost* drag_and_drop_host,
                         AppListConfig* app_list_config,

ash/app_list/views/app_list_bubble_search_page.cc

@@ -127,7 +127,7 @@ ui::Layer* AppListBubbleSearchPage::GetPageAnimationLayerForTest() {
   return search_view_->GetPageAnimationLayer();
 }
 
-BEGIN_METADATA(AppListBubbleSearchPage, views::View)
+BEGIN_METADATA(AppListBubbleSearchPage)
 END_METADATA
 
 }  // namespace ash

ash/app_list/views/app_list_bubble_search_page.h

@@ -26,9 +26,9 @@ class SearchResultPageDialogController;
 // Contains a scrolling list of search results. Does not include the search box,
 // which is owned by a parent view.
 class ASH_EXPORT AppListBubbleSearchPage : public views::View {
- public:
-  METADATA_HEADER(AppListBubbleSearchPage);
+  METADATA_HEADER(AppListBubbleSearchPage, views::View)
 
+ public:
   AppListBubbleSearchPage(AppListViewDelegate* view_delegate,
                           SearchResultPageDialogController* dialog_controller,
                           SearchBoxView* search_box_view);

ash/app_list/views/app_list_folder_view.cc

@@ -1297,7 +1297,7 @@ void AppListFolderView::CancelReparentDragFromRootGrid() {
   items_grid_view_->EndDrag(/*cancel=*/true);
 }
 
-BEGIN_METADATA(AppListFolderView, views::View)
+BEGIN_METADATA(AppListFolderView)
 END_METADATA
 
 }  // namespace ash

ash/app_list/views/app_list_folder_view.h

@@ -47,9 +47,9 @@ class ASH_EXPORT AppListFolderView : public views::View,
                                      public AppListModelObserver,
                                      public views::ViewObserver,
                                      public AppsGridViewFolderDelegate {
- public:
-  METADATA_HEADER(AppListFolderView);
+  METADATA_HEADER(AppListFolderView, views::View)
 
+ public:
   // The maximum number of columns a folder can have.
   static constexpr int kMaxFolderColumns = 4;
 

ash/app_list/views/app_list_item_view.cc

@@ -2313,7 +2313,7 @@ bool AppListItemView::AlwaysPaintsToLayer() {
   return is_promise_app_ || progress_indicator_;
 }
 
-BEGIN_METADATA(AppListItemView, views::Button)
+BEGIN_METADATA(AppListItemView)
 END_METADATA
 
 }  // namespace ash

ash/app_list/views/app_list_item_view.h

@@ -64,9 +64,9 @@ class ASH_EXPORT AppListItemView : public views::Button,
                                    public views::ContextMenuController,
                                    public AppListItemObserver,
                                    public ui::ImplicitAnimationObserver {
- public:
-  METADATA_HEADER(AppListItemView);
+  METADATA_HEADER(AppListItemView, views::Button)
 
+ public:
   // The types of context where the app list item view is shown.
   enum class Context {
     // The item is shown in an AppsGridView.

ash/app_list/views/app_list_search_view.cc

@@ -522,7 +522,7 @@ ui::Layer* AppListSearchView::GetPageAnimationLayer() const {
   return scroll_view_->contents()->layer();
 }
 
-BEGIN_METADATA(AppListSearchView, views::View)
+BEGIN_METADATA(AppListSearchView)
 END_METADATA
 
 }  // namespace ash

ash/app_list/views/app_list_search_view.h

@@ -38,9 +38,9 @@ class SearchResultImageListView;
 class ASH_EXPORT AppListSearchView : public views::View,
                                      public SearchResultContainerView::Delegate,
                                      public AppListModelProvider::Observer {
- public:
-  METADATA_HEADER(AppListSearchView);
+  METADATA_HEADER(AppListSearchView, views::View)
 
+ public:
   AppListSearchView(AppListViewDelegate* view_delegate,
                     SearchResultPageDialogController* dialog_controller,
                     SearchBoxView* search_box_view);

ash/app_list/views/app_list_toast_view.h

@@ -116,9 +116,9 @@ class ASH_EXPORT AppListToastView : public views::View {
 
  private:
   class ToastPillButton : public PillButton {
-   public:
-    METADATA_HEADER(ToastPillButton);
+    METADATA_HEADER(ToastPillButton, PillButton)
 
+   public:
     ToastPillButton(AppListViewDelegate* view_delegate,
                     PressedCallback callback,
                     const std::u16string& text,

ash/app_list/views/apps_grid_view.cc

@@ -3728,7 +3728,7 @@ void AppsGridView::OnIdealBoundsAnimationDone() {
   DestroyLayerItemsIfNotNeeded();
 }
 
-BEGIN_METADATA(AppsGridView, views::View)
+BEGIN_METADATA(AppsGridView)
 END_METADATA
 
 }  // namespace ash

ash/app_list/views/apps_grid_view.h

@@ -70,9 +70,9 @@ class ASH_EXPORT AppsGridView : public views::View,
                                 public AppListItemListObserver,
                                 public AppListItemObserver,
                                 public AppListModelObserver {
- public:
-  METADATA_HEADER(AppsGridView);
+  METADATA_HEADER(AppsGridView, views::View)
 
+ public:
   enum Pointer {
     NONE,
     MOUSE,

ash/app_list/views/assistant/app_list_bubble_assistant_page.cc

@@ -51,7 +51,7 @@ void AppListBubbleAssistantPage::InitializeUIForBubbleView() {
   main_stage_->InitializeUIForBubbleView();
 }
 
-BEGIN_METADATA(AppListBubbleAssistantPage, views::View)
+BEGIN_METADATA(AppListBubbleAssistantPage)
 END_METADATA
 
 }  // namespace ash

ash/app_list/views/assistant/app_list_bubble_assistant_page.h

@@ -19,9 +19,9 @@ class AssistantViewDelegate;
 // The assistant page for the app list bubble / clamshell launcher. Similar to
 // AssistantMainView in the fullscreen launcher.
 class ASH_EXPORT AppListBubbleAssistantPage : public views::View {
- public:
-  METADATA_HEADER(AppListBubbleAssistantPage);
+  METADATA_HEADER(AppListBubbleAssistantPage, views::View)
 
+ public:
   explicit AppListBubbleAssistantPage(AssistantViewDelegate* delegate);
   AppListBubbleAssistantPage(const AppListBubbleAssistantPage&) = delete;
   AppListBubbleAssistantPage& operator=(const AppListBubbleAssistantPage&) =

ash/app_list/views/assistant/assistant_dialog_plate.cc

@@ -522,7 +522,7 @@ InputModality AssistantDialogPlate::input_modality() const {
   return AssistantInteractionController::Get()->GetModel()->input_modality();
 }
 
-BEGIN_METADATA(AssistantDialogPlate, views::View)
+BEGIN_METADATA(AssistantDialogPlate)
 END_METADATA
 
 }  // namespace ash

ash/app_list/views/assistant/assistant_dialog_plate.h

@@ -49,9 +49,9 @@ class ASH_EXPORT AssistantDialogPlate
       public AssistantInteractionModelObserver,
       public AssistantUiModelObserver,
       public AssistantButtonListener {
- public:
-  METADATA_HEADER(AssistantDialogPlate);
+  METADATA_HEADER(AssistantDialogPlate, views::View)
 
+ public:
   explicit AssistantDialogPlate(AssistantViewDelegate* delegate);
   AssistantDialogPlate(const AssistantDialogPlate&) = delete;
   AssistantDialogPlate& operator=(const AssistantDialogPlate&) = delete;

ash/app_list/views/assistant/assistant_main_stage.cc

@@ -510,7 +510,7 @@ void AppListAssistantMainStage::InitializeUIForStartingSession(
   }
 }
 
-BEGIN_METADATA(AppListAssistantMainStage, views::View)
+BEGIN_METADATA(AppListAssistantMainStage)
 END_METADATA
 
 }  // namespace ash

ash/app_list/views/assistant/assistant_main_stage.h

@@ -37,9 +37,9 @@ class ASH_EXPORT AppListAssistantMainStage
       public AssistantControllerObserver,
       public AssistantInteractionModelObserver,
       public AssistantUiModelObserver {
- public:
-  METADATA_HEADER(AppListAssistantMainStage);
+  METADATA_HEADER(AppListAssistantMainStage, views::View)
 
+ public:
   explicit AppListAssistantMainStage(AssistantViewDelegate* delegate);
   AppListAssistantMainStage(const AppListAssistantMainStage&) = delete;
   AppListAssistantMainStage& operator=(const AppListAssistantMainStage&) =

ash/app_list/views/assistant/assistant_main_view.cc

@@ -133,7 +133,7 @@ void AssistantMainView::InitLayout() {
   layout->SetFlexForView(main_stage_, 1);
 }
 
-BEGIN_METADATA(AssistantMainView, views::View)
+BEGIN_METADATA(AssistantMainView)
 END_METADATA
 
 }  // namespace ash

ash/app_list/views/assistant/assistant_main_view.h

@@ -24,9 +24,9 @@ class AssistantViewDelegate;
 class ASH_EXPORT AssistantMainView : public views::View,
                                      public AssistantControllerObserver,
                                      public AssistantUiModelObserver {
- public:
-  METADATA_HEADER(AssistantMainView);
+  METADATA_HEADER(AssistantMainView, views::View)
 
+ public:
   explicit AssistantMainView(AssistantViewDelegate* delegate);
   AssistantMainView(const AssistantMainView&) = delete;
   AssistantMainView& operator=(const AssistantMainView&) = delete;

ash/app_list/views/assistant/assistant_page_view.cc

@@ -441,7 +441,7 @@ void AssistantPageView::UpdateBackground(bool in_tablet_mode) {
     layer()->SetColor(SK_ColorWHITE);
 }
 
-BEGIN_METADATA(AssistantPageView, views::View)
+BEGIN_METADATA(AssistantPageView)
 END_METADATA
 
 }  // namespace ash

ash/app_list/views/assistant/assistant_page_view.h

@@ -35,9 +35,9 @@ class ASH_EXPORT AssistantPageView : public AppListPage,
                                      public AssistantControllerObserver,
                                      public AssistantUiModelObserver,
                                      public display::DisplayObserver {
- public:
-  METADATA_HEADER(AssistantPageView);
+  METADATA_HEADER(AssistantPageView, AppListPage)
 
+ public:
   explicit AssistantPageView(AssistantViewDelegate* assistant_view_delegate);
   AssistantPageView(const AssistantPageView&) = delete;
   AssistantPageView& operator=(const AssistantPageView&) = delete;

ash/app_list/views/continue_section_view.cc

@@ -491,7 +491,7 @@ void ContinueSectionView::ConfigureLayoutForAvailableWidth(
   }
 }
 
-BEGIN_METADATA(ContinueSectionView, views::View)
+BEGIN_METADATA(ContinueSectionView)
 END_METADATA
 
 }  // namespace ash

ash/app_list/views/continue_section_view.h

@@ -28,9 +28,9 @@ class ASH_EXPORT ContinueSectionView : public views::View,
                                        public views::FocusChangeListener,
                                        public AppListModelProvider::Observer,
                                        public AppListControllerObserver {
- public:
-  METADATA_HEADER(ContinueSectionView);
+  METADATA_HEADER(ContinueSectionView, views::View)
 
+ public:
   ContinueSectionView(AppListViewDelegate* view_delegate,
                       int columns,
                       bool tablet_mode);

ash/app_list/views/continue_task_container_view.cc

@@ -592,7 +592,7 @@ int ContinueTaskContainerView::GetIndexOfFocusedTaskView() const {
   return -1;
 }
 
-BEGIN_METADATA(ContinueTaskContainerView, views::View)
+BEGIN_METADATA(ContinueTaskContainerView)
 END_METADATA
 
 }  // namespace ash

ash/app_list/views/continue_task_container_view.h

@@ -38,9 +38,9 @@ class ContinueTaskView;
 // layout with the number of columns specified at construction.
 class ASH_EXPORT ContinueTaskContainerView : public ui::ListModelObserver,
                                              public views::View {
- public:
-  METADATA_HEADER(ContinueTaskContainerView);
+  METADATA_HEADER(ContinueTaskContainerView, views::View)
 
+ public:
   using OnResultsChanged = base::RepeatingClosure;
 
   ContinueTaskContainerView(AppListViewDelegate* view_delegate,

ash/app_list/views/continue_task_view.cc

@@ -422,7 +422,7 @@ void ContinueTaskView::LogMetricsOnResultRemoved() {
                                 GetTaskResultType(), TaskResultType::kMaxValue);
 }
 
-BEGIN_METADATA(ContinueTaskView, views::View)
+BEGIN_METADATA(ContinueTaskView)
 END_METADATA
 
 }  // namespace ash

ash/app_list/views/continue_task_view.h

@@ -38,6 +38,8 @@ class ASH_EXPORT ContinueTaskView : public views::Button,
                                     public views::ContextMenuController,
                                     public ui::SimpleMenuModel::Delegate,
                                     public SearchResultObserver {
+  METADATA_HEADER(ContinueTaskView, views::Button)
+
  public:
   // The type of result for the task.
   // These values are used for metrics and should not be changed.
@@ -48,8 +50,6 @@ class ASH_EXPORT ContinueTaskView : public views::Button,
     kMaxValue = kUnknown,
   };
 
-  METADATA_HEADER(ContinueTaskView);
-
   ContinueTaskView(AppListViewDelegate* view_delegate, bool tablet_mode);
   ContinueTaskView(const ContinueTaskView&) = delete;
   ContinueTaskView& operator=(const ContinueTaskView&) = delete;

ash/app_list/views/recent_apps_view.cc

@@ -341,7 +341,7 @@ int RecentAppsView::CalculateTilePadding() const {
   return width_to_distribute / ((kMaxRecommendedApps - 1) * 2);
 }
 
-BEGIN_METADATA(RecentAppsView, views::View)
+BEGIN_METADATA(RecentAppsView)
 END_METADATA
 
 }  // namespace ash

ash/app_list/views/recent_apps_view.h

@@ -32,9 +32,9 @@ class SearchModel;
 // a list of app icons.
 class ASH_EXPORT RecentAppsView : public AppListModelObserver,
                                   public views::View {
- public:
-  METADATA_HEADER(RecentAppsView);
+  METADATA_HEADER(RecentAppsView, views::View)
 
+ public:
   RecentAppsView(AppListKeyboardController* keyboard_controller,
                  AppListViewDelegate* view_delegate);
   RecentAppsView(const RecentAppsView&) = delete;

ash/app_list/views/scrollable_apps_grid_view.cc

@@ -376,7 +376,7 @@ const gfx::Vector2d ScrollableAppsGridView::CalculateTransitionOffset(
   return gfx::Vector2d();
 }
 
-BEGIN_METADATA(ScrollableAppsGridView, AppsGridView)
+BEGIN_METADATA(ScrollableAppsGridView)
 END_METADATA
 
 }  // namespace ash

ash/app_list/views/scrollable_apps_grid_view.h

@@ -28,9 +28,9 @@ class AppListViewDelegate;
 // feature where the user can drag an app icon to the top or bottom of the
 // containing ScrollView and the view will be scrolled automatically.
 class ASH_EXPORT ScrollableAppsGridView : public AppsGridView {
- public:
-  METADATA_HEADER(ScrollableAppsGridView);
+  METADATA_HEADER(ScrollableAppsGridView, AppsGridView)
 
+ public:
   ScrollableAppsGridView(AppListA11yAnnouncer* a11y_announcer,
                          AppListViewDelegate* view_delegate,
                          AppsGridViewFolderDelegate* folder_delegate,

ash/app_list/views/search_result_actions_view.cc

@@ -47,9 +47,9 @@ constexpr int kActionButtonBetweenSpacing = 8;
 
 // SearchResultActionButton renders the button defined by SearchResult::Action.
 class SearchResultActionButton : public IconButton {
- public:
-  METADATA_HEADER(SearchResultActionButton);
+  METADATA_HEADER(SearchResultActionButton, IconButton)
 
+ public:
   SearchResultActionButton(SearchResultActionsView* parent,
                            const SearchResult::Action& action,
                            PressedCallback callback,
@@ -134,7 +134,7 @@ int SearchResultActionButton::GetButtonRadius() const {
   return width() / 2;
 }
 
-BEGIN_METADATA(SearchResultActionButton, IconButton)
+BEGIN_METADATA(SearchResultActionButton)
 END_METADATA
 
 SearchResultActionsView::SearchResultActionsView(
@@ -272,7 +272,7 @@ void SearchResultActionsView::ChildVisibilityChanged(views::View* child) {
   PreferredSizeChanged();
 }
 
-BEGIN_METADATA(SearchResultActionsView, views::View)
+BEGIN_METADATA(SearchResultActionsView)
 END_METADATA
 
 }  // namespace ash

ash/app_list/views/search_result_actions_view.h

@@ -21,9 +21,9 @@ class SearchResultView;
 // SearchResultActionsView displays a SearchResult::Actions in a button
 // strip. Each action is presented as a button and horizontally laid out.
 class ASH_EXPORT SearchResultActionsView : public views::View {
- public:
-  METADATA_HEADER(SearchResultActionsView);
+  METADATA_HEADER(SearchResultActionsView, views::View)
 
+ public:
   explicit SearchResultActionsView(SearchResultActionsViewDelegate* delegate);
 
   SearchResultActionsView(const SearchResultActionsView&) = delete;

ash/app_list/views/search_result_base_view.cc

@@ -179,7 +179,7 @@ void SearchResultBaseView::ClearSelectedResultAction() {
   }
 }
 
-BEGIN_METADATA(SearchResultBaseView, views::Button)
+BEGIN_METADATA(SearchResultBaseView)
 END_METADATA
 
 }  // namespace ash

ash/app_list/views/search_result_base_view.h

@@ -22,8 +22,9 @@ class SearchResultActionsView;
 // Base class for views that observe and display a search result
 class ASH_EXPORT SearchResultBaseView : public views::Button,
                                         public SearchResultObserver {
+  METADATA_HEADER(SearchResultBaseView, views::Button)
+
  public:
-  METADATA_HEADER(SearchResultBaseView);
   SearchResultBaseView();
 
   SearchResultBaseView(const SearchResultBaseView&) = delete;

ash/app_list/views/search_result_image_list_view.cc

@@ -282,7 +282,7 @@ std::vector<views::View*> SearchResultImageListView::GetViewsToAnimate() {
   return {image_view_container_};
 }
 
-BEGIN_METADATA(SearchResultImageListView, SearchResultContainerView)
+BEGIN_METADATA(SearchResultImageListView)
 END_METADATA
 
 }  // namespace ash

ash/app_list/views/search_result_image_list_view.h

@@ -23,8 +23,9 @@ namespace ash {
 // SearchResultImageListView displays a horizontal strip of
 // SearchResultImageViews inside the AppListSearchView.
 class ASH_EXPORT SearchResultImageListView : public SearchResultContainerView {
+  METADATA_HEADER(SearchResultImageListView, SearchResultContainerView)
+
  public:
-  METADATA_HEADER(SearchResultImageListView);
   explicit SearchResultImageListView(AppListViewDelegate* view_delegate);
   SearchResultImageListView(const SearchResultImageListView&) = delete;
   SearchResultImageListView& operator=(const SearchResultImageListView&) =

ash/app_list/views/search_result_image_view.cc

@@ -48,8 +48,9 @@ constexpr gfx::Insets kFocusRingInsets =
 constexpr double kDraggedImageOpacity = 0.6;
 
 class ImagePreviewView : public views::ImageButton {
+  METADATA_HEADER(ImagePreviewView, views::ImageButton)
+
  public:
-  METADATA_HEADER(ImagePreviewView);
   ImagePreviewView() {
     SetInstallFocusRingOnFocus(false);
     SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
@@ -74,7 +75,7 @@ class ImagePreviewView : public views::ImageButton {
   }
 };
 
-BEGIN_METADATA(ImagePreviewView, views::ImageButton)
+BEGIN_METADATA(ImagePreviewView)
 END_METADATA
 
 }  // namespace
@@ -199,7 +200,7 @@ void SearchResultImageView::OnMetadataChanged() {
 
 SearchResultImageView::~SearchResultImageView() = default;
 
-BEGIN_METADATA(SearchResultImageView, SearchResultBaseView)
+BEGIN_METADATA(SearchResultImageView)
 END_METADATA
 
 }  // namespace ash

ash/app_list/views/search_result_image_view.h

@@ -21,8 +21,9 @@ class SearchResultImageViewDelegate;
 
 // Displays a search result in the form of an unlabeled image.
 class ASH_EXPORT SearchResultImageView : public SearchResultBaseView {
+  METADATA_HEADER(SearchResultImageView, SearchResultBaseView)
+
  public:
-  METADATA_HEADER(SearchResultImageView);
   SearchResultImageView(int index,
                         SearchResultImageListView* list_view,
                         SearchResultImageViewDelegate* image_view_delegate);

ash/app_list/views/search_result_page_view.cc

@@ -66,8 +66,9 @@ constexpr base::TimeDelta kDecreasingHeightSearchResultsDuration =
 // A container view that ensures the card background and the shadow are painted
 // in the correct order.
 class SearchCardView : public views::View {
+  METADATA_HEADER(SearchCardView, views::View)
+
  public:
-  METADATA_HEADER(SearchCardView);
   explicit SearchCardView(std::unique_ptr<views::View> content_view) {
     SetLayoutManager(std::make_unique<views::FillLayout>());
     AddChildView(std::move(content_view));
@@ -77,7 +78,7 @@ class SearchCardView : public views::View {
   ~SearchCardView() override = default;
 };
 
-BEGIN_METADATA(SearchCardView, views::View)
+BEGIN_METADATA(SearchCardView)
 END_METADATA
 
 }  // namespace

ash/app_list/views/search_result_view.cc

@@ -1600,7 +1600,7 @@ bool SearchResultView::IsSearchResultHoveredOrSelected() {
   return IsMouseHovered() || selected();
 }
 
-BEGIN_METADATA(SearchResultView, SearchResultBaseView)
+BEGIN_METADATA(SearchResultView)
 END_METADATA
 
 }  // namespace ash

ash/app_list/views/search_result_view.h

@@ -118,6 +118,8 @@ class SearchResultPageDialogController;
 
 class ASH_EXPORT SearchResultView : public SearchResultBaseView,
                                     public SearchResultActionsViewDelegate {
+  METADATA_HEADER(SearchResultView, SearchResultBaseView)
+
  public:
   class LabelAndTag {
    public:
@@ -152,7 +154,6 @@ class ASH_EXPORT SearchResultView : public SearchResultBaseView,
     kKeyboardShortcut,
   };
 
-  METADATA_HEADER(SearchResultView);
   SearchResultView(SearchResultListView* list_view,
                    AppListViewDelegate* view_delegate,
                    SearchResultPageDialogController* dialog_controller,