Revert "Remove ButtonListener in favor of callbacks. Other cleanup."

This reverts commit 86ef81d7.

Reason for revert: I suspect this causes test failures on CrOS.

Original change's description:
> Remove ButtonListener in favor of callbacks. Other cleanup.
>
> Add metadata - remove manually overridden GetClassName.
>
> Add view builders and update view tree construction to use the builder.
>
> TBR=katie@chromium.org
>
> Bug: 772945, 938501, 1130078
> Change-Id: Id105b26afb15138ee6e70e7ade5e43be11671a47
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2505880
> Reviewed-by: Allen Bauer <kylixrd@chromium.org>
> Reviewed-by: Peter Boström <pbos@chromium.org>
> Reviewed-by: Tetsui Ohkubo <tetsui@chromium.org>
> Commit-Queue: Allen Bauer <kylixrd@chromium.org>
> Auto-Submit: Allen Bauer <kylixrd@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#824581}

TBR=pkasting@chromium.org,pbos@chromium.org,kylixrd@chromium.org,tetsui@chromium.org,katie@chromium.org

Change-Id: I5502a73a1f1f5870937efbbb2588f676748bbad1
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 772945
Bug: 938501
Bug: 1130078
Bug: 1146255
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2521980Reviewed-by: Hitoshi Yoshida <peria@chromium.org>
Commit-Queue: Hitoshi Yoshida <peria@chromium.org>
Cr-Commit-Position: refs/heads/master@{#824702}

ash/system/accessibility/autoclick_menu_view.cc

@@ -12,7 +12,6 @@
 #include "ash/system/accessibility/floating_menu_button.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/unified/top_shortcut_button.h"
-#include "base/bind.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -24,7 +23,6 @@
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/box_layout.h"
-#include "ui/views/metadata/metadata_impl_macros.h"
 
 namespace ash {
 
@@ -38,103 +36,92 @@ const int kSeparatorHeight = 16;
 }  // namespace
 
 AutoclickMenuView::AutoclickMenuView(AutoclickEventType type,
-                                     FloatingMenuPosition position) {
+                                     FloatingMenuPosition position)
+    : left_click_button_(
+          new FloatingMenuButton(this,
+                                 kAutoclickLeftClickIcon,
+                                 IDS_ASH_AUTOCLICK_OPTION_LEFT_CLICK,
+                                 false /* flip_for_rtl */)),
+      right_click_button_(
+          new FloatingMenuButton(this,
+                                 kAutoclickRightClickIcon,
+                                 IDS_ASH_AUTOCLICK_OPTION_RIGHT_CLICK,
+                                 false /* flip_for_rtl */)),
+      double_click_button_(
+          new FloatingMenuButton(this,
+                                 kAutoclickDoubleClickIcon,
+                                 IDS_ASH_AUTOCLICK_OPTION_DOUBLE_CLICK,
+                                 false /* flip_for_rtl */)),
+      drag_button_(
+          new FloatingMenuButton(this,
+                                 kAutoclickDragIcon,
+                                 IDS_ASH_AUTOCLICK_OPTION_DRAG_AND_DROP,
+                                 false /* flip_for_rtl */)),
+      scroll_button_(new FloatingMenuButton(this,
+                                            kAutoclickScrollIcon,
+                                            IDS_ASH_AUTOCLICK_OPTION_SCROLL,
+                                            false /* flip_for_rtl */)),
+      pause_button_(new FloatingMenuButton(this,
+                                           kAutoclickPauseIcon,
+                                           IDS_ASH_AUTOCLICK_OPTION_NO_ACTION,
+                                           false /* flip_for_rtl */)),
+      position_button_(
+          new FloatingMenuButton(this,
+                                 kAutoclickPositionBottomLeftIcon,
+                                 IDS_ASH_AUTOCLICK_OPTION_CHANGE_POSITION,
+                                 false /* flip_for_rtl */,
+                                 kPanelPositionButtonSize,
+                                 false /* no highlight */,
+                                 false /* is_a11y_togglable */)) {
+  // Set view IDs for testing.
+  left_click_button_->SetId(static_cast<int>(ButtonId::kLeftClick));
+  right_click_button_->SetId(static_cast<int>(ButtonId::kRightClick));
+  double_click_button_->SetId(static_cast<int>(ButtonId::kDoubleClick));
+  drag_button_->SetId(static_cast<int>(ButtonId::kDragAndDrop));
+  pause_button_->SetId(static_cast<int>(ButtonId::kPause));
+  position_button_->SetId(static_cast<int>(ButtonId::kPosition));
+  if (scroll_button_)
+    scroll_button_->SetId(static_cast<int>(ButtonId::kScroll));
+
+  std::unique_ptr<views::BoxLayout> layout = std::make_unique<views::BoxLayout>(
+      views::BoxLayout::Orientation::kHorizontal, gfx::Insets(), 0);
+  layout->set_cross_axis_alignment(views::BoxLayout::CrossAxisAlignment::kEnd);
+  SetLayoutManager(std::move(layout));
+
+  // The action control buttons all have the same spacing.
+  views::View* action_button_container = new views::View();
+  action_button_container->SetLayoutManager(std::make_unique<views::BoxLayout>(
+      views::BoxLayout::Orientation::kHorizontal, kUnifiedMenuItemPadding,
+      kUnifiedTopShortcutSpacing));
+  action_button_container->AddChildView(left_click_button_);
+  action_button_container->AddChildView(right_click_button_);
+  action_button_container->AddChildView(double_click_button_);
+  action_button_container->AddChildView(drag_button_);
+  if (scroll_button_)
+    action_button_container->AddChildView(scroll_button_);
+  action_button_container->AddChildView(pause_button_);
+  AddChildView(action_button_container);
+
+  views::Separator* separator = new views::Separator();
+  separator->SetColor(AshColorProvider::Get()->GetContentLayerColor(
+      AshColorProvider::ContentLayerType::kSeparatorColor));
+  separator->SetPreferredHeight(kSeparatorHeight);
   int total_height = kUnifiedTopShortcutSpacing * 2 + kTrayItemSize;
   int separator_spacing = (total_height - kSeparatorHeight) / 2;
-  views::Builder<AutoclickMenuView>(this)
-      .SetCrossAxisAlignment(views::BoxLayout::CrossAxisAlignment::kEnd)
-      .AddChildren(
-          {views::Builder<views::BoxLayoutView>()
-               .SetInsideBorderInsets(kUnifiedMenuItemPadding)
-               .SetBetweenChildSpacing(kUnifiedTopShortcutSpacing)
-               .AddChildren(
-                   {views::Builder<FloatingMenuButton>()
-                        .CopyAddressTo(&left_click_button_)
-                        .SetID(static_cast<int>(ButtonId::kLeftClick))
-                        .SetVectorIcon(kAutoclickLeftClickIcon)
-                        .SetTooltipText(l10n_util::GetStringUTF16(
-                            IDS_ASH_AUTOCLICK_OPTION_LEFT_CLICK))
-                        .SetCallback(base::BindRepeating(
-                            &AutoclickMenuView::OnAutoclickButtonPressed,
-                            base::Unretained(this),
-                            base::Unretained(left_click_button_))),
-                    views::Builder<FloatingMenuButton>()
-                        .CopyAddressTo(&right_click_button_)
-                        .SetID(static_cast<int>(ButtonId::kRightClick))
-                        .SetVectorIcon(kAutoclickRightClickIcon)
-                        .SetTooltipText(l10n_util::GetStringUTF16(
-                            IDS_ASH_AUTOCLICK_OPTION_RIGHT_CLICK))
-                        .SetCallback(base::BindRepeating(
-                            &AutoclickMenuView::OnAutoclickButtonPressed,
-                            base::Unretained(this),
-                            base::Unretained(right_click_button_))),
-                    views::Builder<FloatingMenuButton>()
-                        .CopyAddressTo(&double_click_button_)
-                        .SetID(static_cast<int>(ButtonId::kDoubleClick))
-                        .SetVectorIcon(kAutoclickDoubleClickIcon)
-                        .SetTooltipText(l10n_util::GetStringUTF16(
-                            IDS_ASH_AUTOCLICK_OPTION_DOUBLE_CLICK))
-                        .SetCallback(base::BindRepeating(
-                            &AutoclickMenuView::OnAutoclickButtonPressed,
-                            base::Unretained(this),
-                            base::Unretained(double_click_button_))),
-                    views::Builder<FloatingMenuButton>()
-                        .CopyAddressTo(&drag_button_)
-                        .SetID(static_cast<int>(ButtonId::kDragAndDrop))
-                        .SetVectorIcon(kAutoclickLeftClickIcon)
-                        .SetTooltipText(l10n_util::GetStringUTF16(
-                            IDS_ASH_AUTOCLICK_OPTION_DRAG_AND_DROP))
-                        .SetCallback(base::BindRepeating(
-                            &AutoclickMenuView::OnAutoclickButtonPressed,
-                            base::Unretained(this),
-                            base::Unretained(drag_button_))),
-                    views::Builder<FloatingMenuButton>()
-                        .CopyAddressTo(&scroll_button_)
-                        .SetID(static_cast<int>(ButtonId::kScroll))
-                        .SetVectorIcon(kAutoclickLeftClickIcon)
-                        .SetTooltipText(l10n_util::GetStringUTF16(
-                            IDS_ASH_AUTOCLICK_OPTION_SCROLL))
-                        .SetCallback(base::BindRepeating(
-                            &AutoclickMenuView::OnAutoclickButtonPressed,
-                            base::Unretained(this),
-                            base::Unretained(scroll_button_))),
-                    views::Builder<FloatingMenuButton>()
-                        .CopyAddressTo(&pause_button_)
-                        .SetID(static_cast<int>(ButtonId::kPause))
-                        .SetVectorIcon(kAutoclickLeftClickIcon)
-                        .SetTooltipText(l10n_util::GetStringUTF16(
-                            IDS_ASH_AUTOCLICK_OPTION_NO_ACTION))
-                        .SetCallback(base::BindRepeating(
-                            &AutoclickMenuView::OnAutoclickButtonPressed,
-                            base::Unretained(this),
-                            base::Unretained(pause_button_)))}),
-           views::Builder<views::Separator>()
-               .SetColor(AshColorProvider::Get()->GetContentLayerColor(
-                   AshColorProvider::ContentLayerType::kSeparatorColor))
-               .SetPreferredHeight(kSeparatorHeight)
-               .SetBorder(views::CreateEmptyBorder(
-                   separator_spacing - kUnifiedTopShortcutSpacing, 0,
-                   separator_spacing, 0)),
-           views::Builder<views::BoxLayoutView>()
-               .SetInsideBorderInsets(gfx::Insets(
-                   0, kPanelPositionButtonPadding, kPanelPositionButtonPadding,
-                   kPanelPositionButtonPadding))
-               .SetBetweenChildSpacing(kPanelPositionButtonPadding)
-               .AddChildren(
-                   {views::Builder<FloatingMenuButton>()
-                        .CopyAddressTo(&position_button_)
-                        .SetID(static_cast<int>(ButtonId::kPosition))
-                        .SetVectorIcon(kAutoclickPositionBottomLeftIcon)
-                        .SetPreferredSize(gfx::Size(kPanelPositionButtonSize,
-                                                    kPanelPositionButtonSize))
-                        .SetTooltipText(l10n_util::GetStringUTF16(
-                            IDS_ASH_AUTOCLICK_OPTION_CHANGE_POSITION))
-                        .SetDrawHighlight(false)
-                        .SetA11yTogglable(false)
-                        .SetCallback(base::BindRepeating(
-                            &AutoclickMenuView::OnPositionButtonPressed,
-                            base::Unretained(this)))})})
-      .BuildChildren();
+  separator->SetBorder(views::CreateEmptyBorder(
+      separator_spacing - kUnifiedTopShortcutSpacing, 0, separator_spacing, 0));
+  AddChildView(separator);
+
+  views::View* position_button_container = new views::View();
+  position_button_container->SetLayoutManager(
+      std::make_unique<views::BoxLayout>(
+          views::BoxLayout::Orientation::kHorizontal,
+          gfx::Insets(0, kPanelPositionButtonPadding,
+                      kPanelPositionButtonPadding, kPanelPositionButtonPadding),
+          kPanelPositionButtonPadding));
+  position_button_container->AddChildView(position_button_);
+  AddChildView(position_button_container);
+
   UpdateEventType(type);
   UpdatePosition(position);
 }
@@ -144,7 +131,8 @@ void AutoclickMenuView::UpdateEventType(AutoclickEventType type) {
   right_click_button_->SetToggled(type == AutoclickEventType::kRightClick);
   double_click_button_->SetToggled(type == AutoclickEventType::kDoubleClick);
   drag_button_->SetToggled(type == AutoclickEventType::kDragAndDrop);
-  scroll_button_->SetToggled(type == AutoclickEventType::kScroll);
+  if (scroll_button_)
+    scroll_button_->SetToggled(type == AutoclickEventType::kScroll);
   pause_button_->SetToggled(type == AutoclickEventType::kNoAction);
   if (type != AutoclickEventType::kNoAction)
     event_type_ = type;
@@ -172,7 +160,36 @@ void AutoclickMenuView::UpdatePosition(FloatingMenuPosition position) {
   }
 }
 
-void AutoclickMenuView::OnAutoclickButtonPressed(views::Button* sender) {
+void AutoclickMenuView::ButtonPressed(views::Button* sender,
+                                      const ui::Event& event) {
+  if (sender == position_button_) {
+    FloatingMenuPosition new_position;
+    // Rotate clockwise throughout the screen positions.
+    switch (
+        Shell::Get()->accessibility_controller()->GetAutoclickMenuPosition()) {
+      case FloatingMenuPosition::kBottomRight:
+        new_position = FloatingMenuPosition::kBottomLeft;
+        break;
+      case FloatingMenuPosition::kBottomLeft:
+        new_position = FloatingMenuPosition::kTopLeft;
+        break;
+      case FloatingMenuPosition::kTopLeft:
+        new_position = FloatingMenuPosition::kTopRight;
+        break;
+      case FloatingMenuPosition::kTopRight:
+        new_position = FloatingMenuPosition::kBottomRight;
+        break;
+      case FloatingMenuPosition::kSystemDefault:
+        new_position = base::i18n::IsRTL() ? FloatingMenuPosition::kTopLeft
+                                           : FloatingMenuPosition::kBottomLeft;
+        break;
+    }
+    Shell::Get()->accessibility_controller()->SetAutoclickMenuPosition(
+        new_position);
+    base::RecordAction(base::UserMetricsAction(
+        "Accessibility.CrosAutoclick.TrayMenu.ChangePosition"));
+    return;
+  }
   AutoclickEventType type;
   if (sender == left_click_button_) {
     type = AutoclickEventType::kLeftClick;
@@ -187,8 +204,10 @@ void AutoclickMenuView::OnAutoclickButtonPressed(views::Button* sender) {
   } else if (sender == pause_button_) {
     // If the pause button was already selected, tapping it again turns off
     // pause and returns to the previous type.
-    type = pause_button_->GetToggled() ? event_type_
-                                       : AutoclickEventType::kNoAction;
+    if (pause_button_->IsToggled())
+      type = event_type_;
+    else
+      type = AutoclickEventType::kNoAction;
   } else {
     return;
   }
@@ -198,35 +217,8 @@ void AutoclickMenuView::OnAutoclickButtonPressed(views::Button* sender) {
                             type);
 }
 
-void AutoclickMenuView::OnPositionButtonPressed() {
-  FloatingMenuPosition new_position;
-  // Rotate clockwise throughout the screen positions.
-  switch (
-      Shell::Get()->accessibility_controller()->GetAutoclickMenuPosition()) {
-    case FloatingMenuPosition::kBottomRight:
-      new_position = FloatingMenuPosition::kBottomLeft;
-      break;
-    case FloatingMenuPosition::kBottomLeft:
-      new_position = FloatingMenuPosition::kTopLeft;
-      break;
-    case FloatingMenuPosition::kTopLeft:
-      new_position = FloatingMenuPosition::kTopRight;
-      break;
-    case FloatingMenuPosition::kTopRight:
-      new_position = FloatingMenuPosition::kBottomRight;
-      break;
-    case FloatingMenuPosition::kSystemDefault:
-      new_position = base::i18n::IsRTL() ? FloatingMenuPosition::kTopLeft
-                                         : FloatingMenuPosition::kBottomLeft;
-      break;
-  }
-  Shell::Get()->accessibility_controller()->SetAutoclickMenuPosition(
-      new_position);
-  base::RecordAction(base::UserMetricsAction(
-      "Accessibility.CrosAutoclick.TrayMenu.ChangePosition"));
+const char* AutoclickMenuView::GetClassName() const {
+  return "AutoclickMenuView";
 }
 
-BEGIN_METADATA(AutoclickMenuView, views::BoxLayoutView)
-END_METADATA
-
 }  // namespace ash

ash/system/accessibility/autoclick_menu_view.h

@@ -7,9 +7,7 @@
 
 #include "ash/public/cpp/accessibility_controller_enums.h"
 #include "ash/system/tray/tray_bubble_view.h"
-#include "ui/views/layout/box_layout_view.h"
-#include "ui/views/metadata/metadata_header_macros.h"
-#include "ui/views/metadata/view_factory.h"
+#include "ui/views/controls/button/button.h"
 
 namespace ash {
 
@@ -17,10 +15,8 @@ class FloatingMenuButton;
 
 // View for the Automatic Clicks Menu, which creates and manages
 // individual buttons to control Automatic Clicks settings.
-class AutoclickMenuView : public views::BoxLayoutView {
+class AutoclickMenuView : public views::View, public views::ButtonListener {
  public:
-  METADATA_HEADER(AutoclickMenuView);
-
   // Used for testing. Start at 1 because a view IDs should not be 0.
   enum class ButtonId {
     kPosition = 1,
@@ -33,37 +29,35 @@ class AutoclickMenuView : public views::BoxLayoutView {
   };
 
   AutoclickMenuView(AutoclickEventType type, FloatingMenuPosition position);
-  AutoclickMenuView(const AutoclickMenuView&) = delete;
-  AutoclickMenuView& operator=(const AutoclickMenuView&) = delete;
   ~AutoclickMenuView() override = default;
 
   void UpdateEventType(AutoclickEventType type);
   void UpdatePosition(FloatingMenuPosition position);
 
- private:
-  void OnAutoclickButtonPressed(views::Button* sender);
-  void OnPositionButtonPressed();
+  // views::ButtonListener:
+  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
+  // views::View:
+  const char* GetClassName() const override;
+
+ private:
   // Unowned. Owned by views hierarchy.
-  FloatingMenuButton* left_click_button_ = nullptr;
-  FloatingMenuButton* right_click_button_ = nullptr;
-  FloatingMenuButton* double_click_button_ = nullptr;
-  FloatingMenuButton* drag_button_ = nullptr;
+  FloatingMenuButton* left_click_button_;
+  FloatingMenuButton* right_click_button_;
+  FloatingMenuButton* double_click_button_;
+  FloatingMenuButton* drag_button_;
   FloatingMenuButton* scroll_button_ = nullptr;
-  FloatingMenuButton* pause_button_ = nullptr;
-  FloatingMenuButton* position_button_ = nullptr;
+  FloatingMenuButton* pause_button_;
+  FloatingMenuButton* position_button_;
 
   // The most recently selected event_type_ excluding kNoAction. This is used
   // when the pause button is selected in order to unpause and reset to the
   // previous state.
   AutoclickEventType event_type_ = AutoclickEventType::kLeftClick;
-};
 
-BEGIN_VIEW_BUILDER(/* no export */, AutoclickMenuView, views::BoxLayoutView)
-END_VIEW_BUILDER
+  DISALLOW_COPY_AND_ASSIGN(AutoclickMenuView);
+};
 
 }  // namespace ash
 
-DEFINE_VIEW_BUILDER(/* no export */, ash::AutoclickMenuView)
-
 #endif  // ASH_SYSTEM_ACCESSIBILITY_AUTOCLICK_MENU_VIEW_H_

ash/system/accessibility/autoclick_scroll_view.cc

@@ -12,7 +12,6 @@
 #include "ash/system/accessibility/autoclick_menu_bubble_controller.h"
 #include "ash/system/accessibility/floating_menu_button.h"
 #include "ash/system/unified/custom_shape_button.h"
-#include "base/bind.h"
 #include "base/macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/timer/timer.h"
@@ -22,8 +21,6 @@
 #include "ui/gfx/vector_icon_types.h"
 #include "ui/views/controls/highlight_path_generator.h"
 #include "ui/views/masked_targeter_delegate.h"
-#include "ui/views/metadata/metadata_header_macros.h"
-#include "ui/views/metadata/metadata_impl_macros.h"
 #include "ui/views/view.h"
 
 namespace ash {
@@ -47,30 +44,25 @@ SkColor HoveredButtonColor() {
 }  // namespace
 
 // The close button for the automatic clicks scroll bubble.
-class AutoclickScrollCloseButton : public FloatingMenuButton {
+class AutoclickScrollCloseButton : public FloatingMenuButton,
+                                   public views::ButtonListener {
  public:
-  METADATA_HEADER(AutoclickScrollCloseButton);
-
   AutoclickScrollCloseButton()
-      : FloatingMenuButton(
-            base::BindRepeating(&AutoclickScrollCloseButton::OnButtonPressed,
-                                base::Unretained(this)),
-            kAutoclickCloseIcon,
-            IDS_ASH_AUTOCLICK_SCROLL_CLOSE,
-            /*flip_for_rtl=*/false,
-            kScrollButtonCloseSizeDips,
-            /*draw_highlight=*/false,
-            /*is_a11y_togglable=*/false) {
+      : FloatingMenuButton(this,
+                           kAutoclickCloseIcon,
+                           IDS_ASH_AUTOCLICK_SCROLL_CLOSE,
+                           /*flip_for_rtl=*/false,
+                           kScrollButtonCloseSizeDips,
+                           /*draw_highlight=*/false,
+                           /*is_a11y_togglable=*/false) {
     views::View::SetID(
         static_cast<int>(AutoclickScrollView::ButtonId::kCloseScroll));
   }
-  AutoclickScrollCloseButton(const AutoclickScrollCloseButton&) = delete;
-  AutoclickScrollCloseButton& operator=(const AutoclickScrollCloseButton&) =
-      delete;
 
   ~AutoclickScrollCloseButton() override = default;
 
-  void OnButtonPressed() {
+  // views::ButtonListener:
+  void ButtonPressed(views::Button* sender, const ui::Event& event) override {
     Shell::Get()->autoclick_controller()->DoScrollAction(
         AutoclickController::ScrollPadAction::kScrollClose);
     base::RecordAction(base::UserMetricsAction(
@@ -102,28 +94,28 @@ class AutoclickScrollCloseButton : public FloatingMenuButton {
     views::ImageButton::PaintButtonContents(canvas);
   }
 
+  const char* GetClassName() const override {
+    return "AutoclickScrollCloseButton";
+  }
+
  private:
   bool hovered_ = false;
+  DISALLOW_COPY_AND_ASSIGN(AutoclickScrollCloseButton);
 };
 
-BEGIN_METADATA(AutoclickScrollCloseButton, FloatingMenuButton)
-END_METADATA
-
 // A single scroll button (up/down/left/right) for automatic clicks scroll
 // bubble. Subclasses a MaskedTargeterDelegate in order to only get events over
 // the button's custom shape, rather than over the whole rectangle which
 // encloses the button.
 class AutoclickScrollButton : public CustomShapeButton,
-                              public views::MaskedTargeterDelegate {
+                              public views::MaskedTargeterDelegate,
+                              public views::ButtonListener {
  public:
-  METADATA_HEADER(AutoclickScrollButton);
   AutoclickScrollButton(AutoclickController::ScrollPadAction action,
                         const gfx::VectorIcon& icon,
                         int accessible_name_id,
                         AutoclickScrollView::ButtonId id)
-      : CustomShapeButton(
-            base::BindRepeating(&AutoclickScrollButton::OnButtonPressed,
-                                base::Unretained(this))),
+      : CustomShapeButton(PressedCallback(this, this)),
         action_(action),
         icon_(icon) {
     views::View::SetID(static_cast<int>(id));
@@ -153,8 +145,6 @@ class AutoclickScrollButton : public CustomShapeButton,
 
     views::InstallRoundRectHighlightPathGenerator(this, gfx::Insets(), 0.f);
   }
-  AutoclickScrollButton(const AutoclickScrollButton&) = delete;
-  AutoclickScrollButton& operator=(const AutoclickScrollButton&) = delete;
 
   ~AutoclickScrollButton() override {
     Shell::Get()->autoclick_controller()->OnExitedScrollButton();
@@ -190,7 +180,10 @@ class AutoclickScrollButton : public CustomShapeButton,
     scroll_hover_timer_->Reset();
   }
 
-  void OnButtonPressed() { ProcessAction(action_); }
+  // views::ButtonListener:
+  void ButtonPressed(views::Button* sender, const ui::Event& event) override {
+    ProcessAction(action_);
+  }
 
   // CustomShapeButton:
   SkPath CreateCustomShapePath(const gfx::Rect& bounds) const override {
@@ -322,16 +315,17 @@ class AutoclickScrollButton : public CustomShapeButton,
     SchedulePaint();
   }
 
+  const char* GetClassName() const override { return "AutoclickScrollButton"; }
+
  private:
   const AutoclickController::ScrollPadAction action_;
   gfx::Size size_;
   std::unique_ptr<base::RetainingOneShotTimer> scroll_hover_timer_;
   bool active_ = false;
   const gfx::VectorIcon& icon_;
-};
 
-BEGIN_METADATA(AutoclickScrollButton, CustomShapeButton)
-END_METADATA
+  DISALLOW_COPY_AND_ASSIGN(AutoclickScrollButton);
+};
 
 // ------ AutoclickScrollBubbleView  ------ //
 

ash/system/accessibility/floating_accessibility_view.cc

@@ -18,11 +18,9 @@
 #include "ash/system/accessibility/select_to_speak_tray.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/virtual_keyboard/virtual_keyboard_tray.h"
-#include "base/bind.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/box_layout.h"
-#include "ui/views/metadata/metadata_impl_macros.h"
 
 namespace ash {
 
@@ -111,11 +109,15 @@ bool FloatingAccessibilityBubbleView::AcceleratorPressed(
   return true;
 }
 
-BEGIN_METADATA(FloatingAccessibilityBubbleView, TrayBubbleView)
-END_METADATA
+const char* FloatingAccessibilityBubbleView::GetClassName() const {
+  return "FloatingAccessibilityBubbleView";
+}
 
 FloatingAccessibilityView::FloatingAccessibilityView(Delegate* delegate)
     : delegate_(delegate) {
+  std::unique_ptr<views::BoxLayout> layout = std::make_unique<views::BoxLayout>(
+      views::BoxLayout::Orientation::kHorizontal, gfx::Insets(), 0);
+  SetLayoutManager(std::move(layout));
 
   Shelf* shelf = RootWindowController::ForTargetRootWindow()->shelf();
   std::unique_ptr<views::View> feature_buttons_container =
@@ -134,10 +136,7 @@ FloatingAccessibilityView::FloatingAccessibilityView(Delegate* delegate)
       CreateButtonRowContainer(kUnifiedTopShortcutSpacing);
   a11y_tray_button_ =
       tray_button_container->AddChildView(std::make_unique<FloatingMenuButton>(
-          base::BindRepeating(
-              &FloatingAccessibilityView::OnA11yTrayButtonPressed,
-              base::Unretained(this)),
-          kUnifiedMenuAccessibilityIcon,
+          this, kUnifiedMenuAccessibilityIcon,
           IDS_ASH_FLOATING_ACCESSIBILITY_DETAILED_MENU_OPEN,
           /*flip_for_rtl*/ true));
 
@@ -145,10 +144,7 @@ FloatingAccessibilityView::FloatingAccessibilityView(Delegate* delegate)
       CreateButtonRowContainer(kPanelPositionButtonPadding);
   position_button_ = position_button_container->AddChildView(
       std::make_unique<FloatingMenuButton>(
-          base::BindRepeating(
-              &FloatingAccessibilityView::OnPositionButtonPressed,
-              base::Unretained(this)),
-          kAutoclickPositionBottomLeftIcon,
+          this, kAutoclickPositionBottomLeftIcon,
           IDS_ASH_AUTOCLICK_OPTION_CHANGE_POSITION, /*flip_for_rtl*/ false,
           kPanelPositionButtonSize, false, /* is_a11y_togglable */ false));
 
@@ -158,8 +154,8 @@ FloatingAccessibilityView::FloatingAccessibilityView(Delegate* delegate)
   AddChildView(std::move(position_button_container));
 
   // Set view IDs for testing.
-  position_button_->SetID(static_cast<int>(ButtonId::kPosition));
-  a11y_tray_button_->SetID(static_cast<int>(ButtonId::kSettingsList));
+  position_button_->SetId(static_cast<int>(ButtonId::kPosition));
+  a11y_tray_button_->SetId(static_cast<int>(ButtonId::kSettingsList));
   dictation_button_->SetID(static_cast<int>(ButtonId::kDictation));
   select_to_speak_button_->SetID(static_cast<int>(ButtonId::kSelectToSpeak));
   virtual_keyboard_button_->SetID(static_cast<int>(ButtonId::kVirtualKeyboard));
@@ -207,37 +203,47 @@ void FloatingAccessibilityView::FocusOnDetailedViewButton() {
   a11y_tray_button_->RequestFocus();
 }
 
-void FloatingAccessibilityView::OnA11yTrayButtonPressed() {
-  delegate_->OnDetailedMenuEnabled(!a11y_tray_button_->GetToggled());
-}
+void FloatingAccessibilityView::ButtonPressed(views::Button* sender,
+                                              const ui::Event& event) {
+  if (sender == a11y_tray_button_) {
+    delegate_->OnDetailedMenuEnabled(!a11y_tray_button_->IsToggled());
+    return;
+  }
 
-void FloatingAccessibilityView::OnPositionButtonPressed() {
-  FloatingMenuPosition new_position;
-  // Rotate clockwise throughout the screen positions.
-  switch (Shell::Get()->accessibility_controller()->GetFloatingMenuPosition()) {
-    case FloatingMenuPosition::kBottomRight:
-      new_position = FloatingMenuPosition::kBottomLeft;
-      break;
-    case FloatingMenuPosition::kBottomLeft:
-      new_position = FloatingMenuPosition::kTopLeft;
-      break;
-    case FloatingMenuPosition::kTopLeft:
-      new_position = FloatingMenuPosition::kTopRight;
-      break;
-    case FloatingMenuPosition::kTopRight:
-      new_position = FloatingMenuPosition::kBottomRight;
-      break;
-    case FloatingMenuPosition::kSystemDefault:
-      new_position = base::i18n::IsRTL() ? FloatingMenuPosition::kTopLeft
-                                         : FloatingMenuPosition::kBottomLeft;
-      break;
+  if (sender == position_button_) {
+    FloatingMenuPosition new_position;
+    // Rotate clockwise throughout the screen positions.
+    switch (
+        Shell::Get()->accessibility_controller()->GetFloatingMenuPosition()) {
+      case FloatingMenuPosition::kBottomRight:
+        new_position = FloatingMenuPosition::kBottomLeft;
+        break;
+      case FloatingMenuPosition::kBottomLeft:
+        new_position = FloatingMenuPosition::kTopLeft;
+        break;
+      case FloatingMenuPosition::kTopLeft:
+        new_position = FloatingMenuPosition::kTopRight;
+        break;
+      case FloatingMenuPosition::kTopRight:
+        new_position = FloatingMenuPosition::kBottomRight;
+        break;
+      case FloatingMenuPosition::kSystemDefault:
+        new_position = base::i18n::IsRTL() ? FloatingMenuPosition::kTopLeft
+                                           : FloatingMenuPosition::kBottomLeft;
+        break;
+    }
+    Shell::Get()->accessibility_controller()->SetFloatingMenuPosition(
+        new_position);
+    Shell::Get()
+        ->accessibility_controller()
+        ->TriggerAccessibilityAlertWithMessage(
+            GetDescriptionForMovedToPosition(new_position));
   }
-  Shell::Get()->accessibility_controller()->SetFloatingMenuPosition(
-      new_position);
-  Shell::Get()
-      ->accessibility_controller()
-      ->TriggerAccessibilityAlertWithMessage(
-          GetDescriptionForMovedToPosition(new_position));
+  return;
+}
+
+const char* FloatingAccessibilityView::GetClassName() const {
+  return "AccessiblityFloatingView";
 }
 
 void FloatingAccessibilityView::OnViewVisibilityChanged(
@@ -248,7 +254,4 @@ void FloatingAccessibilityView::OnViewVisibilityChanged(
   delegate_->OnLayoutChanged();
 }
 
-BEGIN_METADATA(FloatingAccessibilityView, views::BoxLayoutView)
-END_METADATA
-
 }  // namespace ash

ash/system/accessibility/floating_accessibility_view.h

@@ -11,9 +11,6 @@
 #include "ash/shell_observer.h"
 #include "ash/system/tray/tray_bubble_view.h"
 #include "ui/views/controls/button/button.h"
-#include "ui/views/layout/box_layout_view.h"
-#include "ui/views/metadata/metadata_header_macros.h"
-#include "ui/views/metadata/view_factory.h"
 
 namespace ash {
 
@@ -22,8 +19,6 @@ class TrayBackgroundView;
 
 class FloatingAccessibilityBubbleView : public TrayBubbleView {
  public:
-  METADATA_HEADER(FloatingAccessibilityBubbleView);
-
   explicit FloatingAccessibilityBubbleView(
       const TrayBubbleView::InitParams& init_params);
   FloatingAccessibilityBubbleView(const FloatingAccessibilityBubbleView&) =
@@ -35,12 +30,10 @@ class FloatingAccessibilityBubbleView : public TrayBubbleView {
   // TrayBubbleView:
   bool IsAnchoredToStatusArea() const override;
   bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
-};
 
-BEGIN_VIEW_BUILDER(/* no export */,
-                   FloatingAccessibilityBubbleView,
-                   TrayBubbleView)
-END_VIEW_BUILDER
+  // views::View:
+  const char* GetClassName() const override;
+};
 
 // This floating view displays the currently enabled accessibility options,
 // along with buttons to configure them.
@@ -48,11 +41,10 @@ END_VIEW_BUILDER
 // ----  ?[Dictation] ?[SelectToSpeak] ?[VirtualKeyboard]
 // ----  | [Open settings list]
 // ----  | [Change menu location]
-class FloatingAccessibilityView : public views::BoxLayoutView,
+class FloatingAccessibilityView : public views::View,
+                                  public views::ButtonListener,
                                   public views::ViewObserver {
  public:
-  METADATA_HEADER(FloatingAccessibilityView);
-
   // Used for testing. Starts 1 because views IDs should not be 0.
   enum ButtonId {
     kPosition = 1,
@@ -87,8 +79,11 @@ class FloatingAccessibilityView : public views::BoxLayoutView,
   void FocusOnDetailedViewButton();
 
  private:
-  void OnA11yTrayButtonPressed();
-  void OnPositionButtonPressed();
+  // views::ButtonListener:
+  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
+
+  // views::View:
+  const char* GetClassName() const override;
 
   // views::ViewObserver:
   void OnViewVisibilityChanged(views::View* observed_view,
@@ -106,14 +101,6 @@ class FloatingAccessibilityView : public views::BoxLayoutView,
   Delegate* const delegate_;
 };
 
-BEGIN_VIEW_BUILDER(/* no export */,
-                   FloatingAccessibilityView,
-                   views::BoxLayoutView)
-END_VIEW_BUILDER
-
 }  // namespace ash
 
-DEFINE_VIEW_BUILDER(/* no export */, ash::FloatingAccessibilityBubbleView)
-DEFINE_VIEW_BUILDER(/* no export */, ash::FloatingAccessibilityView)
-
 #endif  // ASH_SYSTEM_ACCESSIBILITY_FLOATING_ACCESSIBILITY_VIEW_H_

ash/system/accessibility/floating_menu_button.cc

@@ -5,6 +5,7 @@
 #include "ash/system/accessibility/floating_menu_button.h"
 
 #include "ash/style/ash_color_provider.h"
+#include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_popup_utils.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -17,23 +18,14 @@
 #include "ui/views/animation/ink_drop_impl.h"
 #include "ui/views/animation/ink_drop_mask.h"
 #include "ui/views/controls/highlight_path_generator.h"
-#include "ui/views/metadata/metadata_impl_macros.h"
 
 namespace ash {
 
-FloatingMenuButton::FloatingMenuButton() {
-  SetImageHorizontalAlignment(ALIGN_CENTER);
-  SetImageVerticalAlignment(ALIGN_MIDDLE);
-  SetFlipCanvasOnPaintForRTLUI(false);
-  TrayPopupUtils::ConfigureTrayPopupButton(this);
-  views::InstallCircleHighlightPathGenerator(this);
-}
-
-FloatingMenuButton::FloatingMenuButton(views::Button::PressedCallback callback,
+FloatingMenuButton::FloatingMenuButton(views::ButtonListener* listener,
                                        const gfx::VectorIcon& icon,
                                        int accessible_name_id,
                                        bool flip_for_rtl)
-    : FloatingMenuButton(callback,
+    : FloatingMenuButton(listener,
                          icon,
                          accessible_name_id,
                          flip_for_rtl,
@@ -41,14 +33,14 @@ FloatingMenuButton::FloatingMenuButton(views::Button::PressedCallback callback,
                          /*draw_highlight=*/true,
                          /*is_a11y_togglable=*/true) {}
 
-FloatingMenuButton::FloatingMenuButton(views::Button::PressedCallback callback,
+FloatingMenuButton::FloatingMenuButton(views::ButtonListener* listener,
                                        const gfx::VectorIcon& icon,
                                        int accessible_name_id,
                                        bool flip_for_rtl,
                                        int size,
                                        bool draw_highlight,
                                        bool is_a11y_togglable)
-    : views::ImageButton(callback),
+    : views::ImageButton(listener),
       icon_(&icon),
       size_(size),
       draw_highlight_(draw_highlight),
@@ -65,44 +57,14 @@ FloatingMenuButton::FloatingMenuButton(views::Button::PressedCallback callback,
 FloatingMenuButton::~FloatingMenuButton() = default;
 
 void FloatingMenuButton::SetVectorIcon(const gfx::VectorIcon& icon) {
-  if (icon_ == &icon)
-    return;
   icon_ = &icon;
   UpdateImage();
 }
 
-bool FloatingMenuButton::GetA11yTogglable() const {
-  return is_a11y_togglable_;
-}
-
-void FloatingMenuButton::SetA11yTogglable(bool a11y_togglable) {
-  if (a11y_togglable == is_a11y_togglable_)
-    return;
-  is_a11y_togglable_ = a11y_togglable;
-  OnPropertyChanged(&is_a11y_togglable_, views::kPropertyEffectsPaint);
-}
-
-bool FloatingMenuButton::GetDrawHighlight() const {
-  return draw_highlight_;
-}
-
-void FloatingMenuButton::SetDrawHighlight(bool draw_highlight) {
-  if (draw_highlight_ == draw_highlight)
-    return;
-  draw_highlight_ = draw_highlight;
-  OnPropertyChanged(&draw_highlight_, views::kPropertyEffectsPaint);
-}
-
-bool FloatingMenuButton::GetToggled() const {
-  return toggled_;
-}
-
 void FloatingMenuButton::SetToggled(bool toggled) {
-  if (toggled_ == toggled)
-    return;
   toggled_ = toggled;
   UpdateImage();
-  OnPropertyChanged(&toggled_, views::PropertyEffects::kPropertyEffectsPaint);
+  SchedulePaint();
 }
 
 void FloatingMenuButton::PaintButtonContents(gfx::Canvas* canvas) {
@@ -137,6 +99,10 @@ void FloatingMenuButton::GetAccessibleNodeData(ui::AXNodeData* node_data) {
                                       : ax::mojom::CheckedState::kFalse);
 }
 
+const char* FloatingMenuButton::GetClassName() const {
+  return "FloatingMenuButton";
+}
+
 std::unique_ptr<views::InkDrop> FloatingMenuButton::CreateInkDrop() {
   return TrayPopupUtils::CreateInkDrop(this);
 }
@@ -161,16 +127,14 @@ void FloatingMenuButton::OnThemeChanged() {
   SchedulePaint();
 }
 
+void FloatingMenuButton::SetId(int id) {
+  views::View::SetID(id);
+}
+
 void FloatingMenuButton::UpdateImage() {
   DCHECK(icon_);
   AshColorProvider::Get()->DecorateIconButton(
       this, *icon_, toggled_, GetDefaultSizeOfVectorIcon(*icon_));
 }
 
-BEGIN_METADATA(FloatingMenuButton, views::ImageButton)
-ADD_PROPERTY_METADATA(bool, A11yTogglable)
-ADD_PROPERTY_METADATA(bool, DrawHighlight)
-ADD_PROPERTY_METADATA(bool, Toggled)
-END_METADATA
-
 }  // namespace ash

ash/system/accessibility/floating_menu_button.h

@@ -5,11 +5,7 @@
 #ifndef ASH_SYSTEM_ACCESSIBILITY_FLOATING_MENU_BUTTON_H_
 #define ASH_SYSTEM_ACCESSIBILITY_FLOATING_MENU_BUTTON_H_
 
-#include "ash/system/tray/tray_constants.h"
-#include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/image_button.h"
-#include "ui/views/metadata/metadata_header_macros.h"
-#include "ui/views/metadata/view_factory.h"
 
 namespace gfx {
 struct VectorIcon;
@@ -22,70 +18,57 @@ namespace ash {
 
 class FloatingMenuButton : public views::ImageButton {
  public:
-  METADATA_HEADER(FloatingMenuButton);
-
-  FloatingMenuButton();
-  FloatingMenuButton(views::Button::PressedCallback callback,
+  FloatingMenuButton(views::ButtonListener* listener,
                      const gfx::VectorIcon& icon,
                      int accessible_name_id,
                      bool flip_for_rtl);
 
-  FloatingMenuButton(views::Button::PressedCallback callback,
+  FloatingMenuButton(views::ButtonListener* listener,
                      const gfx::VectorIcon& icon,
                      int accessible_name_id,
                      bool flip_for_rtl,
                      int size,
                      bool draw_highlight,
                      bool is_a11y_togglable);
-  FloatingMenuButton(const FloatingMenuButton&) = delete;
-  FloatingMenuButton& operator=(const FloatingMenuButton&) = delete;
 
   ~FloatingMenuButton() override;
 
   // Set the vector icon shown in a circle.
   void SetVectorIcon(const gfx::VectorIcon& icon);
 
-  bool GetA11yTogglable() const;
-  void SetA11yTogglable(bool a11y_togglable);
-
-  bool GetDrawHighlight() const;
-  void SetDrawHighlight(bool draw_highlight);
-
-  // Toggle state property.
-  bool GetToggled() const;
+  // Change the toggle state.
   void SetToggled(bool toggled);
 
+  bool IsToggled() { return toggled_; }
+
   // views::ImageButton:
   void PaintButtonContents(gfx::Canvas* canvas) override;
   gfx::Size CalculatePreferredSize() const override;
   void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
+  const char* GetClassName() const override;
   std::unique_ptr<views::InkDrop> CreateInkDrop() override;
   std::unique_ptr<views::InkDropRipple> CreateInkDropRipple() const override;
   std::unique_ptr<views::InkDropHighlight> CreateInkDropHighlight()
       const override;
   void OnThemeChanged() override;
 
+  // Used in tests.
+  void SetId(int id);
+
  private:
   void UpdateImage();
 
   const gfx::VectorIcon* icon_;
   // True if the button is currently toggled.
   bool toggled_ = false;
-  int size_ = kTrayItemSize;
-  bool draw_highlight_ = true;
+  int size_;
+  const bool draw_highlight_;
   // Whether this button will be described as togglable to screen reading tools.
-  bool is_a11y_togglable_ = true;
-};
+  const bool is_a11y_togglable_;
 
-BEGIN_VIEW_BUILDER(/* no export */, FloatingMenuButton, views::ImageButton)
-VIEW_BUILDER_PROPERTY(bool, A11yTogglable)
-VIEW_BUILDER_PROPERTY(bool, DrawHighlight)
-VIEW_BUILDER_PROPERTY(bool, Toggled)
-VIEW_BUILDER_PROPERTY(const gfx::VectorIcon&, VectorIcon)
-END_VIEW_BUILDER
+  DISALLOW_COPY_AND_ASSIGN(FloatingMenuButton);
+};
 
 }  // namespace ash
 
-DEFINE_VIEW_BUILDER(/* no export */, ash::FloatingMenuButton)
-
 #endif  // ASH_SYSTEM_ACCESSIBILITY_FLOATING_MENU_BUTTON_H_

ash/system/accessibility/switch_access_back_button_view.cc

@@ -8,18 +8,15 @@
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/system/accessibility/floating_menu_button.h"
 #include "ash/system/tray/tray_constants.h"
-#include "base/bind.h"
 #include "cc/paint/paint_flags.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/accessibility/mojom/ax_node_data.mojom-shared.h"
-#include "ui/base/l10n/l10n_util.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/views/layout/box_layout.h"
-#include "ui/views/metadata/metadata_impl_macros.h"
 
 namespace ash {
 
@@ -32,29 +29,28 @@ constexpr int kFocusRingBufferDp = 1;
 constexpr int kRadiusDp = 18;
 }  // namespace
 
-SwitchAccessBackButtonView::SwitchAccessBackButtonView(bool for_menu) {
+SwitchAccessBackButtonView::SwitchAccessBackButtonView(bool for_menu)
+    : back_button_(new FloatingMenuButton(
+          this,
+          for_menu ? kSwitchAccessCloseIcon : kSwitchAccessBackIcon,
+          IDS_ASH_SWITCH_ACCESS_BACK_BUTTON_DESCRIPTION,
+          /*flip_for_rtl=*/false,
+          2 * kRadiusDp,
+          /*draw_highlight=*/true,
+          /*is_a11y_togglable=*/false)) {
+  views::BoxLayout* layout =
+      SetLayoutManager(std::make_unique<views::BoxLayout>(
+          views::BoxLayout::Orientation::kHorizontal, gfx::Insets()));
+  layout->set_main_axis_alignment(views::BoxLayout::MainAxisAlignment::kCenter);
+  AddChildView(back_button_);
+
   // Calculate the side length of the bounding box, with room for the two-color
   // focus ring on either side.
   int focus_ring_width_per_side =
       2 * kFocusRingSingleColorWidthDp + kFocusRingBufferDp;
   int side_length = 2 * (kRadiusDp + focus_ring_width_per_side);
-
-  views::Builder<SwitchAccessBackButtonView>(this)
-      .SetMainAxisAlignment(views::BoxLayout::MainAxisAlignment::kCenter)
-      .AddChildren(
-          {views::Builder<FloatingMenuButton>()
-               .CopyAddressTo(&back_button_)
-               .SetVectorIcon(for_menu ? kSwitchAccessCloseIcon
-                                       : kSwitchAccessBackIcon)
-               .SetTooltipText(l10n_util::GetStringUTF16(
-                   IDS_ASH_SWITCH_ACCESS_BACK_BUTTON_DESCRIPTION))
-               .SetPreferredSize(gfx::Size(2 * kRadiusDp, 2 * kRadiusDp))
-               .SetDrawHighlight(true)
-               .SetCallback(base::BindRepeating(
-                   &SwitchAccessBackButtonView::OnButtonPressed,
-                   base::Unretained(this)))})
-      .SetSize(gfx::Size(side_length, side_length))
-      .BuildChildren();
+  gfx::Size size(side_length, side_length);
+  SetSize(size);
 }
 
 void SwitchAccessBackButtonView::SetFocusRing(bool should_show) {
@@ -71,6 +67,12 @@ void SwitchAccessBackButtonView::SetForMenu(bool for_menu) {
     back_button_->SetVectorIcon(kSwitchAccessBackIcon);
 }
 
+void SwitchAccessBackButtonView::ButtonPressed(views::Button* sender,
+                                               const ui::Event& event) {
+  NotifyAccessibilityEvent(ax::mojom::Event::kClicked,
+                           /*send_native_event=*/false);
+}
+
 void SwitchAccessBackButtonView::GetAccessibleNodeData(
     ui::AXNodeData* node_data) {
   node_data->role = ax::mojom::Role::kButton;
@@ -80,6 +82,10 @@ int SwitchAccessBackButtonView::GetHeightForWidth(int w) const {
   return w;
 }
 
+const char* SwitchAccessBackButtonView::GetClassName() const {
+  return "SwitchAccessBackButtonView";
+}
+
 void SwitchAccessBackButtonView::OnPaint(gfx::Canvas* canvas) {
   gfx::Rect rect(GetContentsBounds());
   cc::PaintFlags flags;
@@ -102,12 +108,4 @@ void SwitchAccessBackButtonView::OnPaint(gfx::Canvas* canvas) {
                      kRadiusDp + (2 * kFocusRingSingleColorWidthDp), flags);
 }
 
-void SwitchAccessBackButtonView::OnButtonPressed() {
-  NotifyAccessibilityEvent(ax::mojom::Event::kClicked,
-                           /*send_native_event=*/false);
-}
-
-BEGIN_METADATA(SwitchAccessBackButtonView, views::BoxLayoutView)
-END_METADATA
-
 }  // namespace ash

ash/system/accessibility/switch_access_back_button_view.h

@@ -5,9 +5,7 @@
 #ifndef ASH_SYSTEM_ACCESSIBILITY_SWITCH_ACCESS_BACK_BUTTON_VIEW_H_
 #define ASH_SYSTEM_ACCESSIBILITY_SWITCH_ACCESS_BACK_BUTTON_VIEW_H_
 
-#include "ui/views/layout/box_layout_view.h"
-#include "ui/views/metadata/metadata_header_macros.h"
-#include "ui/views/metadata/view_factory.h"
+#include "ui/views/controls/button/button.h"
 #include "ui/views/view.h"
 
 namespace ash {
@@ -15,10 +13,9 @@ namespace ash {
 class FloatingMenuButton;
 
 // View for the Switch Access Back Button.
-class SwitchAccessBackButtonView : public views::BoxLayoutView {
+class SwitchAccessBackButtonView : public views::View,
+                                   public views::ButtonListener {
  public:
-  METADATA_HEADER(SwitchAccessBackButtonView);
-
   explicit SwitchAccessBackButtonView(bool for_menu);
   ~SwitchAccessBackButtonView() override = default;
 
@@ -29,27 +26,22 @@ class SwitchAccessBackButtonView : public views::BoxLayoutView {
   void SetFocusRing(bool should_show);
   void SetForMenu(bool for_menu);
 
+  // views::ButtonListener:
+  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
+
   // views::View:
   void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
   int GetHeightForWidth(int w) const override;
+  const char* GetClassName() const override;
   void OnPaint(gfx::Canvas* canvas) override;
 
  private:
-  void OnButtonPressed();
-
   bool show_focus_ring_ = false;
 
   // Owned by views hierarchy.
   FloatingMenuButton* back_button_;
 };
 
-BEGIN_VIEW_BUILDER(/* no export */,
-                   SwitchAccessBackButtonView,
-                   views::BoxLayoutView)
-END_VIEW_BUILDER
-
 }  // namespace ash
 
-DEFINE_VIEW_BUILDER(/* no export */, ash::SwitchAccessBackButtonView)
-
 #endif  // ASH_SYSTEM_ACCESSIBILITY_SWITCH_ACCESS_BACK_BUTTON_VIEW_H_

ash/system/accessibility/switch_access_menu_button.cc

@@ -5,7 +5,6 @@
 #include "ash/system/accessibility/switch_access_menu_button.h"
 
 #include "ash/style/ash_color_provider.h"
-#include "base/bind.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/accessibility/mojom/ax_node_data.mojom-shared.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -15,7 +14,6 @@
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
-#include "ui/views/metadata/metadata_impl_macros.h"
 #include "ui/views/style/typography.h"
 
 namespace ash {
@@ -36,36 +34,31 @@ constexpr int kTextLineHeightDip = 20;
 SwitchAccessMenuButton::SwitchAccessMenuButton(std::string action_name,
                                                const gfx::VectorIcon& icon,
                                                int label_text_id)
-    : views::Button(
-          base::BindRepeating(&SwitchAccessMenuButton::OnButtonPressed,
-                              base::Unretained(this))),
-      action_name_(action_name) {
+    : views::Button(this),
+      action_name_(action_name),
+      image_view_(new views::ImageView()),
+      label_(new views::Label(l10n_util::GetStringUTF16(label_text_id),
+                              views::style::CONTEXT_BUTTON)) {
+  SetFocusBehavior(views::View::FocusBehavior::ACCESSIBLE_ONLY);
+  std::unique_ptr<views::BoxLayout> layout = std::make_unique<views::BoxLayout>(
+      views::BoxLayout::Orientation::kVertical,
+      gfx::Insets(kButtonTopPaddingDip, kLabelMinSidePaddingDip,
+                  kButtonBottomPaddingDefaultDip, kLabelMinSidePaddingDip),
+      kLabelTopPaddingDefaultDip);
+
   SkColor icon_color = AshColorProvider::Get()->GetContentLayerColor(
       AshColorProvider::ContentLayerType::kIconColorPrimary);
   SkColor label_color = AshColorProvider::Get()->GetContentLayerColor(
       AshColorProvider::ContentLayerType::kTextColorPrimary);
 
-  views::Builder<SwitchAccessMenuButton>(this)
-      .SetFocusBehavior(views::View::FocusBehavior::ACCESSIBLE_ONLY)
-      .AddChildren(
-          {views::Builder<views::ImageView>()
-               .CopyAddressTo(&image_view_)
-               .SetImage(gfx::CreateVectorIcon(icon, kIconSizeDip, icon_color)),
-           views::Builder<views::Label>()
-               .CopyAddressTo(&label_)
-               .SetText(l10n_util::GetStringUTF16(label_text_id))
-               .SetTextContext(views::style::CONTEXT_BUTTON)
-               .SetAutoColorReadabilityEnabled(false)
-               .SetEnabledColor(label_color)
-               .SetMultiLine(true)
-               .SetMaximumWidth(kLabelMaxWidthDip)})
-      .BuildChildren();
+  image_view_->SetImage(gfx::CreateVectorIcon(icon, kIconSizeDip, icon_color));
+  label_->SetAutoColorReadabilityEnabled(false);
+  label_->SetEnabledColor(label_color);
+  label_->SetMultiLine(true);
+  label_->SetMaximumWidth(kLabelMaxWidthDip);
 
-  std::unique_ptr<views::BoxLayout> layout = std::make_unique<views::BoxLayout>(
-      views::BoxLayout::Orientation::kVertical,
-      gfx::Insets(kButtonTopPaddingDip, kLabelMinSidePaddingDip,
-                  kButtonBottomPaddingDefaultDip, kLabelMinSidePaddingDip),
-      kLabelTopPaddingDefaultDip);
+  AddChildView(image_view_);
+  AddChildView(label_);
 
   // The layout padding changes with the size of the text label.
   gfx::Size label_size = label_->CalculatePreferredSize();
@@ -82,18 +75,16 @@ SwitchAccessMenuButton::SwitchAccessMenuButton(std::string action_name,
   SetLayoutManager(std::move(layout));
 }
 
+void SwitchAccessMenuButton::ButtonPressed(views::Button* sender,
+                                           const ui::Event& event) {
+  NotifyAccessibilityEvent(ax::mojom::Event::kClicked,
+                           /*send_native_event=*/false);
+}
+
 void SwitchAccessMenuButton::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   views::Button::GetAccessibleNodeData(node_data);
   node_data->AddStringAttribute(ax::mojom::StringAttribute::kValue,
                                 action_name_);
 }
 
-void SwitchAccessMenuButton::OnButtonPressed() {
-  NotifyAccessibilityEvent(ax::mojom::Event::kClicked,
-                           /*send_native_event=*/false);
-}
-
-BEGIN_METADATA(SwitchAccessMenuButton, views::Button)
-END_METADATA
-
 }  // namespace ash

ash/system/accessibility/switch_access_menu_button.h

@@ -6,8 +6,6 @@
 #define ASH_SYSTEM_ACCESSIBILITY_SWITCH_ACCESS_MENU_BUTTON_H_
 
 #include "ui/views/controls/button/button.h"
-#include "ui/views/metadata/metadata_header_macros.h"
-#include "ui/views/metadata/view_factory.h"
 
 namespace gfx {
 struct VectorIcon;
@@ -20,10 +18,9 @@ class Label;
 
 namespace ash {
 
-class SwitchAccessMenuButton : public views::Button {
+class SwitchAccessMenuButton : public views::Button,
+                               public views::ButtonListener {
  public:
-  METADATA_HEADER(SwitchAccessMenuButton);
-
   SwitchAccessMenuButton(std::string action_name,
                          const gfx::VectorIcon& icon,
                          int accessible_name_id);
@@ -34,14 +31,15 @@ class SwitchAccessMenuButton : public views::Button {
 
   static constexpr int kWidthDip = 80;
 
+  // views::ButtonListener:
+  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
+
   // views::View:
   void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
 
  private:
   friend class SwitchAccessMenuBubbleControllerTest;
 
-  void OnButtonPressed();
-
   std::string action_name_;
 
   // Owned by the views hierarchy.
@@ -49,11 +47,6 @@ class SwitchAccessMenuButton : public views::Button {
   views::Label* label_;
 };
 
-BEGIN_VIEW_BUILDER(/* no export */, SwitchAccessMenuButton, views::Button)
-END_VIEW_BUILDER
-
 }  // namespace ash
 
-DEFINE_VIEW_BUILDER(/* no export */, ash::SwitchAccessMenuButton)
-
 #endif  // ASH_SYSTEM_ACCESSIBILITY_SWITCH_ACCESS_MENU_BUTTON_H_

ash/system/tray/tray_bubble_view.cc

@@ -31,7 +31,6 @@
 #include "ui/gfx/skia_util.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/layout/box_layout.h"
-#include "ui/views/metadata/metadata_impl_macros.h"
 #include "ui/views/painter.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/widget.h"
@@ -464,6 +463,10 @@ void TrayBubbleView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   }
 }
 
+const char* TrayBubbleView::GetClassName() const {
+  return "TrayBubbleView";
+}
+
 void TrayBubbleView::OnThemeChanged() {
   views::BubbleDialogDelegateView::OnThemeChanged();
   DCHECK(layer());
@@ -496,7 +499,4 @@ void TrayBubbleView::CloseBubbleView() {
   delegate_->HideBubble(this);
 }
 
-BEGIN_METADATA(TrayBubbleView, views::BubbleDialogDelegateView)
-END_METADATA
-
 }  // namespace ash

ash/system/tray/tray_bubble_view.h

@@ -18,8 +18,6 @@
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/views/bubble/bubble_dialog_delegate_view.h"
-#include "ui/views/metadata/metadata_header_macros.h"
-#include "ui/views/metadata/view_factory.h"
 #include "ui/views/mouse_watcher.h"
 
 namespace views {
@@ -37,8 +35,6 @@ namespace ash {
 class ASH_EXPORT TrayBubbleView : public views::BubbleDialogDelegateView,
                                   public views::MouseWatcherListener {
  public:
-  METADATA_HEADER(TrayBubbleView);
-
   class ASH_EXPORT Delegate {
    public:
     Delegate() {}
@@ -105,8 +101,6 @@ class ASH_EXPORT TrayBubbleView : public views::BubbleDialogDelegateView,
   };
 
   explicit TrayBubbleView(const InitParams& init_params);
-  TrayBubbleView(const TrayBubbleView&) = delete;
-  TrayBubbleView& operator=(const TrayBubbleView&) = delete;
   ~TrayBubbleView() override;
 
   // Sets up animations, and show the bubble. Must occur after CreateBubble()
@@ -178,6 +172,7 @@ class ASH_EXPORT TrayBubbleView : public views::BubbleDialogDelegateView,
   void OnMouseEntered(const ui::MouseEvent& event) override;
   void OnMouseExited(const ui::MouseEvent& event) override;
   void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
+  const char* GetClassName() const override;
   void OnThemeChanged() override;
 
   // views::MouseWatcherListener:
@@ -241,13 +236,10 @@ class ASH_EXPORT TrayBubbleView : public views::BubbleDialogDelegateView,
 
   base::Optional<StatusAreaWidget::ScopedTrayBubbleCounter>
       tray_bubble_counter_;
-};
 
-BEGIN_VIEW_BUILDER(ASH_EXPORT, TrayBubbleView, views::BubbleDialogDelegateView)
-END_VIEW_BUILDER
+  DISALLOW_COPY_AND_ASSIGN(TrayBubbleView);
+};
 
 }  // namespace ash
 
-DEFINE_VIEW_BUILDER(ASH_EXPORT, ash::TrayBubbleView)
-
 #endif  // ASH_SYSTEM_TRAY_TRAY_BUBBLE_VIEW_H_

ui/views/bubble/bubble_dialog_delegate_view.h

@@ -16,8 +16,6 @@
 #include "ui/base/class_property.h"
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/bubble/bubble_frame_view.h"
-#include "ui/views/metadata/metadata_header_macros.h"
-#include "ui/views/metadata/view_factory.h"
 #include "ui/views/view_tracker.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
@@ -400,8 +398,7 @@ class VIEWS_EXPORT BubbleDialogDelegateView : public BubbleDialogDelegate,
       View* anchor_view,
       BubbleBorder::Arrow arrow,
       BubbleBorder::Shadow shadow = BubbleBorder::DIALOG_SHADOW);
-  BubbleDialogDelegateView(const BubbleDialogDelegateView&) = delete;
-  BubbleDialogDelegateView& operator=(const BubbleDialogDelegateView&) = delete;
+
   ~BubbleDialogDelegateView() override;
 
   // BubbleDialogDelegate:
@@ -433,13 +430,10 @@ class VIEWS_EXPORT BubbleDialogDelegateView : public BubbleDialogDelegate,
 
   // Update the bubble color from the NativeTheme unless it was explicitly set.
   void UpdateColorsFromTheme();
-};
 
-BEGIN_VIEW_BUILDER(VIEWS_EXPORT, BubbleDialogDelegateView, View)
-END_VIEW_BUILDER
+  DISALLOW_COPY_AND_ASSIGN(BubbleDialogDelegateView);
+};
 
 }  // namespace views
 
-DEFINE_VIEW_BUILDER(VIEWS_EXPORT, BubbleDialogDelegateView)
-
 #endif  // UI_VIEWS_BUBBLE_BUBBLE_DIALOG_DELEGATE_VIEW_H_