Set focus behavior explicitly for buttons

These buttons are subclasses of ImageButton, LabelButton, or
ColorTrackingVectorImageButton. They inherited their focus behavior
previously. This CL explicitly DCHECK and set their behaviors so that
the parent classes' changes won't affect them. The DCHECKs will be
removed when we flip the parent classes' behaviors.

Bug: 1001103
Change-Id: I30f0c08cbdbf7ed8b09c40aa1033e155cb67d6a1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2495921Reviewed-by: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Wei Li <weili@chromium.org>
Cr-Commit-Position: refs/heads/master@{#820861}

chrome/browser/ui/views/accessibility/invert_bubble_view.cc

@@ -70,11 +70,16 @@ InvertBubbleView::InvertBubbleView(Browser* browser, views::View* anchor_view)
       browser_(browser) {
   SetButtons(ui::DIALOG_BUTTON_OK);
   SetButtonLabel(ui::DIALOG_BUTTON_OK, l10n_util::GetStringUTF16(IDS_DONE));
-  SetExtraView(views::CreateVectorImageButtonWithNativeTheme(
-                   base::BindRepeating(&InvertBubbleView::OpenLink,
-                                       base::Unretained(this), kLearnMoreUrl),
-                   vector_icons::kHelpOutlineIcon))
-      ->SetTooltipText(l10n_util::GetStringUTF16(IDS_LEARN_MORE));
+
+  auto button = views::CreateVectorImageButtonWithNativeTheme(
+      base::BindRepeating(&InvertBubbleView::OpenLink, base::Unretained(this),
+                          kLearnMoreUrl),
+      vector_icons::kHelpOutlineIcon);
+  button->SetTooltipText(l10n_util::GetStringUTF16(IDS_LEARN_MORE));
+  DCHECK_EQ(FocusBehavior::ACCESSIBLE_ONLY, button->GetFocusBehavior());
+  button->SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
+  SetExtraView(std::move(button));
+
   set_margins(gfx::Insets());
   chrome::RecordDialogCreation(chrome::DialogIdentifier::INVERT);
 }

chrome/browser/ui/views/autofill/payments/migratable_card_view.cc

@@ -199,6 +199,10 @@ MigratableCardView::GetMigratableCardDescriptionView(
             kTrashCanIcon);
     delete_card_from_local_button->SetTooltipText(l10n_util::GetStringUTF16(
         IDS_AUTOFILL_LOCAL_CARD_MIGRATION_DIALOG_TRASH_CAN_BUTTON_TOOLTIP));
+    DCHECK_EQ(FocusBehavior::ACCESSIBLE_ONLY,
+              delete_card_from_local_button->GetFocusBehavior());
+    delete_card_from_local_button->SetFocusBehavior(
+        FocusBehavior::ACCESSIBLE_ONLY);
     delete_card_from_local_button_ =
         migratable_card_description_view->AddChildView(
             std::move(delete_card_from_local_button));

chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

@@ -154,10 +154,15 @@ class BookmarkButtonBase : public views::LabelButton {
       : LabelButton(std::move(callback), title) {
     SetImageLabelSpacing(ChromeLayoutProvider::Get()->GetDistanceMetric(
         DISTANCE_RELATED_LABEL_HORIZONTAL_LIST));
+
     views::InstallPillHighlightPathGenerator(this);
     SetInkDropMode(InkDropMode::ON);
     SetHasInkDropActionOnClick(true);
     SetInkDropVisibleOpacity(kToolbarInkDropVisibleOpacity);
+
+    DCHECK_EQ(FocusBehavior::ACCESSIBLE_ONLY, GetFocusBehavior());
+    SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
+
     show_animation_ = std::make_unique<gfx::SlideAnimation>(this);
     if (!animations_enabled) {
       // For some reason during testing the events generated by animating

chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc

@@ -143,6 +143,8 @@ IconLabelBubbleView::IconLabelBubbleView(const gfx::FontList& font_list,
 
   views::HighlightPathGenerator::Install(
       this, std::make_unique<HighlightPathGenerator>());
+  DCHECK_EQ(FocusBehavior::ACCESSIBLE_ONLY, GetFocusBehavior());
+  SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
 
   UpdateBorder();
 

chrome/browser/ui/views/omnibox/omnibox_result_view.cc

@@ -54,6 +54,9 @@ class OmniboxRemoveSuggestionButton : public views::ImageButton {
   explicit OmniboxRemoveSuggestionButton(PressedCallback callback)
       : ImageButton(std::move(callback)) {
     views::ConfigureVectorImageButton(this);
+
+    DCHECK_EQ(FocusBehavior::ACCESSIBLE_ONLY, GetFocusBehavior());
+    SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
   }
 
   void GetAccessibleNodeData(ui::AXNodeData* node_data) override {

chrome/browser/ui/views/omnibox/omnibox_row_view.cc

@@ -60,6 +60,9 @@ class OmniboxRowView::HeaderView : public views::View {
             &HeaderView::HeaderToggleButtonPressed, base::Unretained(this))));
     mouse_enter_exit_handler_.ObserveMouseEnterExitOn(header_toggle_button_);
     views::InstallCircleHighlightPathGenerator(header_toggle_button_);
+    DCHECK_EQ(FocusBehavior::ACCESSIBLE_ONLY,
+              header_toggle_button_->GetFocusBehavior());
+    header_toggle_button_->SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
 
     header_toggle_button_focus_ring_ =
         views::FocusRing::Install(header_toggle_button_);

chrome/browser/ui/views/tabs/new_tab_button.cc

@@ -72,6 +72,9 @@ NewTabButton::NewTabButton(TabStrip* tab_strip, PressedCallback callback)
   SetInstallFocusRingOnFocus(true);
   views::HighlightPathGenerator::Install(
       this, std::make_unique<NewTabButton::HighlightPathGenerator>());
+
+  DCHECK_EQ(FocusBehavior::ACCESSIBLE_ONLY, GetFocusBehavior());
+  SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
 }
 
 NewTabButton::~NewTabButton() {

ui/views/controls/button/image_button.cc

@@ -219,7 +219,10 @@ const gfx::Point ImageButton::ComputeImagePaintPosition(
 // ToggleImageButton, public:
 
 ToggleImageButton::ToggleImageButton(PressedCallback callback)
-    : ImageButton(std::move(callback)) {}
+    : ImageButton(std::move(callback)) {
+  DCHECK_EQ(FocusBehavior::ACCESSIBLE_ONLY, GetFocusBehavior());
+  SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
+}
 
 ToggleImageButton::ToggleImageButton(ButtonListener* listener)
     : ToggleImageButton(PressedCallback(listener, this)) {}

ui/views/controls/button/menu_button.cc

@@ -25,6 +25,9 @@ MenuButton::MenuButton(PressedCallback callback,
           std::make_unique<Button::DefaultButtonControllerDelegate>(this));
   menu_button_controller_ = menu_button_controller.get();
   SetButtonController(std::move(menu_button_controller));
+
+  DCHECK_EQ(FocusBehavior::ACCESSIBLE_ONLY, GetFocusBehavior());
+  SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
 }
 
 MenuButton::MenuButton(ButtonListener* listener,