Add metadata to classes in c/b/ui/views/extensions.

Bug: 1159562
Change-Id: Iee1a5be31833c43b68e2516c0ee1872e0a567384
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2631351
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Allen Bauer <kylixrd@chromium.org>
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Allen Bauer <kylixrd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#843907}

chrome/browser/ui/views/extensions/extensions_menu_button.cc

@@ -16,10 +16,9 @@
 #include "chrome/browser/ui/views/hover_button_controller.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "ui/views/controls/button/button.h"
+#include "ui/views/metadata/metadata_impl_macros.h"
 #include "ui/views/style/typography.h"
 
-const char ExtensionsMenuButton::kClassName[] = "ExtensionsMenuButton";
-
 ExtensionsMenuButton::ExtensionsMenuButton(
     Browser* browser,
     ExtensionsMenuItemView* parent,
@@ -44,10 +43,6 @@ ExtensionsMenuButton::ExtensionsMenuButton(
 
 ExtensionsMenuButton::~ExtensionsMenuButton() = default;
 
-const char* ExtensionsMenuButton::GetClassName() const {
-  return kClassName;
-}
-
 SkColor ExtensionsMenuButton::GetInkDropBaseColor() const {
   return HoverButton::GetInkDropColor(this);
 }
@@ -105,3 +100,6 @@ void ExtensionsMenuButton::ButtonPressed() {
   controller_->ExecuteAction(
       true, ToolbarActionViewController::InvocationSource::kMenuEntry);
 }
+
+BEGIN_METADATA(ExtensionsMenuButton, views::LabelButton)
+END_METADATA

chrome/browser/ui/views/extensions/extensions_menu_button.h

@@ -13,6 +13,7 @@
 #include "chrome/browser/ui/views/toolbar/toolbar_action_view_delegate_views.h"
 #include "ui/views/bubble/bubble_dialog_delegate_view.h"
 #include "ui/views/controls/button/label_button.h"
+#include "ui/views/metadata/metadata_header_macros.h"
 
 class ExtensionsMenuItemView;
 
@@ -26,6 +27,7 @@ class Button;
 class ExtensionsMenuButton : public views::LabelButton,
                              public ToolbarActionViewDelegateViews {
  public:
+  METADATA_HEADER(ExtensionsMenuButton);
   ExtensionsMenuButton(Browser* browser,
                        ExtensionsMenuItemView* parent,
                        ToolbarActionViewController* controller,
@@ -34,8 +36,6 @@ class ExtensionsMenuButton : public views::LabelButton,
   ExtensionsMenuButton& operator=(const ExtensionsMenuButton&) = delete;
   ~ExtensionsMenuButton() override;
 
-  static const char kClassName[];
-
   SkColor GetInkDropBaseColor() const override;
   bool CanShowIconInToolbar() const override;
 
@@ -44,9 +44,6 @@ class ExtensionsMenuButton : public views::LabelButton,
   }
 
  private:
-  // views::LabelButton:
-  const char* GetClassName() const override;
-
   // ToolbarActionViewDelegateViews:
   views::View* GetAsView() override;
   views::FocusManager* GetFocusManagerForAccelerator() override;

chrome/browser/ui/views/extensions/extensions_menu_item_view.cc

@@ -26,6 +26,7 @@
 #include "ui/views/controls/button/image_button_factory.h"
 #include "ui/views/layout/flex_layout.h"
 #include "ui/views/layout/flex_layout_types.h"
+#include "ui/views/metadata/metadata_impl_macros.h"
 #include "ui/views/vector_icons.h"
 #include "ui/views/view_class_properties.h"
 
@@ -40,7 +41,6 @@ constexpr int EXTENSION_PINNING = 14;
 
 // static
 constexpr gfx::Size ExtensionsMenuItemView::kIconSize;
-constexpr char ExtensionsMenuItemView::kClassName[];
 
 ExtensionsMenuItemView::ExtensionsMenuItemView(
     Browser* browser,
@@ -101,10 +101,6 @@ ExtensionsMenuItemView::ExtensionsMenuItemView(
 
 ExtensionsMenuItemView::~ExtensionsMenuItemView() = default;
 
-const char* ExtensionsMenuItemView::GetClassName() const {
-  return kClassName;
-}
-
 void ExtensionsMenuItemView::OnThemeChanged() {
   views::View::OnThemeChanged();
   const SkColor icon_color =
@@ -186,3 +182,6 @@ SkColor ExtensionsMenuItemView::GetAdjustedIconColor(SkColor icon_color) const {
   }
   return icon_color;
 }
+
+BEGIN_METADATA(ExtensionsMenuItemView, views::View)
+END_METADATA

chrome/browser/ui/views/extensions/extensions_menu_item_view.h

@@ -7,6 +7,7 @@
 
 #include <memory>
 
+#include "ui/views/metadata/metadata_header_macros.h"
 #include "ui/views/view.h"
 
 class Browser;
@@ -26,9 +27,10 @@ class ImageButton;
 // associated context menu.
 class ExtensionsMenuItemView : public views::View {
  public:
+  METADATA_HEADER(ExtensionsMenuItemView);
+
   static constexpr int kMenuItemHeightDp = 40;
   static constexpr gfx::Size kIconSize{28, 28};
-  static constexpr const char kClassName[] = "ExtensionsMenuItemView";
 
   ExtensionsMenuItemView(
       Browser* browser,
@@ -39,7 +41,6 @@ class ExtensionsMenuItemView : public views::View {
   ~ExtensionsMenuItemView() override;
 
   // views::View:
-  const char* GetClassName() const override;
   void OnThemeChanged() override;
 
   void UpdatePinButton();

chrome/browser/ui/views/extensions/extensions_menu_view.cc

@@ -29,6 +29,7 @@
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/flex_layout.h"
 #include "ui/views/view_class_properties.h"
+#include "ui/views/view_utils.h"
 
 namespace {
 // If true, allows more than one instance of the ExtensionsMenuView, which may
@@ -50,7 +51,7 @@ bool CompareExtensionMenuItemViews(const ExtensionsMenuItemView* a,
 // when the view is known to be one). It is only used as an extra measure to
 // prevent bad static casts.
 ExtensionsMenuItemView* GetAsMenuItemView(views::View* view) {
-  DCHECK_EQ(ExtensionsMenuItemView::kClassName, view->GetClassName());
+  DCHECK(views::IsViewClass<ExtensionsMenuItemView>(view));
   return static_cast<ExtensionsMenuItemView*>(view);
 }
 

chrome/browser/ui/views/extensions/extensions_toolbar_button.cc

@@ -19,6 +19,7 @@
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/accessibility/view_accessibility.h"
 #include "ui/views/controls/button/button_controller.h"
+#include "ui/views/metadata/metadata_impl_macros.h"
 
 ExtensionsToolbarButton::ExtensionsToolbarButton(
     Browser* browser,
@@ -81,10 +82,6 @@ void ExtensionsToolbarButton::OnBoundsChanged(
   SetLayoutInsets(new_insets);
 }
 
-const char* ExtensionsToolbarButton::GetClassName() const {
-  return "ExtensionsToolbarButton";
-}
-
 void ExtensionsToolbarButton::UpdateIcon() {
   SetImageModel(views::Button::STATE_NORMAL,
                 ui::ImageModel::FromVectorIcon(
@@ -111,7 +108,7 @@ void ExtensionsToolbarButton::ToggleExtensionsMenu() {
       ->AddObserver(this);
 }
 
-bool ExtensionsToolbarButton::IsExtensionsMenuShowing() const {
+bool ExtensionsToolbarButton::GetExtensionsMenuShowing() const {
   return pressed_lock_.get();
 }
 
@@ -120,3 +117,8 @@ int ExtensionsToolbarButton::GetIconSize() const {
   return (touch_ui && !browser_->app_controller()) ? kDefaultTouchableIconSize
                                                    : kDefaultIconSize;
 }
+
+BEGIN_METADATA(ExtensionsToolbarButton, ToolbarButton)
+ADD_READONLY_PROPERTY_METADATA(bool, ExtensionsMenuShowing)
+ADD_READONLY_PROPERTY_METADATA(int, IconSize)
+END_METADATA

chrome/browser/ui/views/extensions/extensions_toolbar_button.h

@@ -9,6 +9,7 @@
 
 #include "chrome/browser/ui/views/toolbar/toolbar_button.h"
 #include "ui/views/controls/button/menu_button_controller.h"
+#include "ui/views/metadata/metadata_header_macros.h"
 #include "ui/views/widget/widget_observer.h"
 
 class Browser;
@@ -20,6 +21,7 @@ class ExtensionsToolbarContainer;
 class ExtensionsToolbarButton : public ToolbarButton,
                                 public views::WidgetObserver {
  public:
+  METADATA_HEADER(ExtensionsToolbarButton);
   ExtensionsToolbarButton(Browser* browser,
                           ExtensionsToolbarContainer* extensions_container);
   ExtensionsToolbarButton(const ExtensionsToolbarButton&) = delete;
@@ -30,13 +32,12 @@ class ExtensionsToolbarButton : public ToolbarButton,
   // kAutoHide mode and hidden this will cause it to show.
   void ToggleExtensionsMenu();
 
-  bool IsExtensionsMenuShowing() const;
+  bool GetExtensionsMenuShowing() const;
 
   // ToolbarButton:
   gfx::Size CalculatePreferredSize() const override;
   gfx::Size GetMinimumSize() const override;
   void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
-  const char* GetClassName() const override;
   void UpdateIcon() override;
 
   // views::WidgetObserver:

chrome/browser/ui/views/extensions/extensions_toolbar_container.cc

@@ -21,6 +21,7 @@
 #include "ui/views/layout/animating_layout_manager.h"
 #include "ui/views/layout/flex_layout.h"
 #include "ui/views/layout/flex_layout_types.h"
+#include "ui/views/metadata/metadata_impl_macros.h"
 #include "ui/views/view_class_properties.h"
 
 namespace {
@@ -654,10 +655,6 @@ int ExtensionsToolbarContainer::OnPerformDrop(
   return ui::DragDropTypes::DRAG_MOVE;
 }
 
-const char* ExtensionsToolbarContainer::GetClassName() const {
-  return "ExtensionsToolbarContainer";
-}
-
 void ExtensionsToolbarContainer::OnWidgetClosing(views::Widget* widget) {
   auto iter = std::find_if(
       anchored_widgets_.begin(), anchored_widgets_.end(),
@@ -731,7 +728,7 @@ bool ExtensionsToolbarContainer::ShouldContainerBeVisible() const {
     return true;
 
   // Is menu showing.
-  if (extensions_button_->IsExtensionsMenuShowing())
+  if (extensions_button_->GetExtensionsMenuShowing())
     return true;
 
   // Is extension pop out is showing.
@@ -758,3 +755,6 @@ void ExtensionsToolbarContainer::OnMenuOpening() {
 void ExtensionsToolbarContainer::OnMenuClosed() {
   UpdateContainerVisibility();
 }
+
+BEGIN_METADATA(ExtensionsToolbarContainer, ToolbarIconContainerView)
+END_METADATA

chrome/browser/ui/views/extensions/extensions_toolbar_container.h

@@ -19,6 +19,7 @@
 #include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_icon_container_view.h"
+#include "ui/views/metadata/metadata_header_macros.h"
 #include "ui/views/widget/widget_observer.h"
 
 class Browser;
@@ -40,6 +41,8 @@ class ExtensionsToolbarContainer : public ToolbarIconContainerView,
                                    public ToolbarActionView::Delegate,
                                    public views::WidgetObserver {
  public:
+  METADATA_HEADER(ExtensionsToolbarContainer);
+
   using ToolbarIcons =
       std::map<ToolbarActionsModel::ActionId, ToolbarActionView*>;
 
@@ -116,7 +119,6 @@ class ExtensionsToolbarContainer : public ToolbarIconContainerView,
   int OnDragUpdated(const ui::DropTargetEvent& event) override;
   void OnDragExited() override;
   int OnPerformDrop(const ui::DropTargetEvent& event) override;
-  const char* GetClassName() const override;
 
   // ExtensionsContainer:
   ToolbarActionViewController* GetActionForId(