Keep focus on Find-In-Page buttons when using the keyboard to navigate.

chrome/browser/ui/views/find_bar_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/find_bar_view.h"
 
 #include <algorithm>
 
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 134 matching lines @@
 
     find_previous_button_ = find_previous;
     find_next_button_ = find_next;
     close_button_ = close;
   } else {
     find_previous_button_ = new views::ImageButton(this);
     find_next_button_ = new views::ImageButton(this);
     close_button_ = new views::ImageButton(this);
   }
 
-  find_previous_button_->set_tag(FIND_PREVIOUS_TAG);
+  find_previous_button_->set_id(VIEW_ID_FIND_IN_PAGE_PREVIOUS_BUTTON);
   find_previous_button_->SetFocusable(true);
   find_previous_button_->set_request_focus_on_press(false);
   find_previous_button_->SetTooltipText(
       l10n_util::GetStringUTF16(IDS_FIND_IN_PAGE_PREVIOUS_TOOLTIP));
   find_previous_button_->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_ACCNAME_PREVIOUS));
   AddChildView(find_previous_button_);
 
-  find_next_button_->set_tag(FIND_NEXT_TAG);
+  find_next_button_->set_id(VIEW_ID_FIND_IN_PAGE_NEXT_BUTTON);
   find_next_button_->SetFocusable(true);
   find_next_button_->set_request_focus_on_press(false);
   find_next_button_->SetTooltipText(
       l10n_util::GetStringUTF16(IDS_FIND_IN_PAGE_NEXT_TOOLTIP));
   find_next_button_->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_ACCNAME_NEXT));
   AddChildView(find_next_button_);
 
-  close_button_->set_tag(CLOSE_TAG);
+  close_button_->set_id(VIEW_ID_FIND_IN_PAGE_CLOSE_BUTTON);
   close_button_->SetFocusable(true);
   close_button_->set_request_focus_on_press(false);
   close_button_->SetTooltipText(
       l10n_util::GetStringUTF16(IDS_FIND_IN_PAGE_CLOSE_TOOLTIP));
   close_button_->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));
   close_button_->SetAnimationDuration(0);
   AddChildView(close_button_);
 
   // Create a focus forwarder view which sends focus to find_text_.
@@ skipping 231 matching lines @@
   prefsize.Enlarge(find_next_button_->GetPreferredSize().width(), 0);
   prefsize.Enlarge(close_button_->GetPreferredSize().width(), 0);
   return prefsize;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // FindBarView, views::ButtonListener implementation:
 
 void FindBarView::ButtonPressed(
     views::Button* sender, const ui::Event& event) {
-  switch (sender->tag()) {
-    case FIND_PREVIOUS_TAG:
-    case FIND_NEXT_TAG:
+  switch (sender->id()) {
+    case VIEW_ID_FIND_IN_PAGE_PREVIOUS_BUTTON:
+    case VIEW_ID_FIND_IN_PAGE_NEXT_BUTTON:
       if (!find_text_->text().empty()) {
         FindTabHelper* find_tab_helper = FindTabHelper::FromWebContents(
             find_bar_host()->GetFindBarController()->web_contents());
-        find_tab_helper->StartFinding(find_text_->text(),
-                                      sender->tag() == FIND_NEXT_TAG,
-                                      false);  // Not case sensitive.
+        find_tab_helper->StartFinding(
+            find_text_->text(),
+            sender->id() == VIEW_ID_FIND_IN_PAGE_NEXT_BUTTON,
+            false);  // Not case sensitive.
       }
-      // Move focus to the find textfield.
-      find_text_->RequestFocus();
+
+      if (event.IsMouseEvent()) {
+        // Move focus to the find textfield.
+        find_text_->RequestFocus();
+      }
       break;
-    case CLOSE_TAG:
+    case VIEW_ID_FIND_IN_PAGE_CLOSE_BUTTON:
       find_bar_host()->GetFindBarController()->EndFindSession(
           FindBarController::kKeepSelectionOnPage,
           FindBarController::kKeepResultsInFindBox);
       break;
     default:
       NOTREACHED() << L"Unknown button";
       break;
   }
 }
 
@@ skipping 145 matching lines @@
     // sent for a lot more things than just the user nulling out the search
     // terms. See http://crbug.com/45372.
     Profile* profile =
         Profile::FromBrowserContext(web_contents->GetBrowserContext());
     FindBarState* find_bar_state = FindBarStateFactory::GetForProfile(profile);
     find_bar_state->set_last_prepopulate_text(base::string16());
   }
 }
 
 void FindBarView::UpdateMatchCountAppearance(bool no_match) {
-  bool enable_buttons = !match_count_text_->text().empty() && !no_match;
+  // Enable the buttons if there is a match or if there is a match count text
+  // set (from a prepopulated view).
+  bool enable_buttons = !match_count_text_->text().empty() || !no_match;
   find_previous_button_->SetEnabled(enable_buttons);
   find_next_button_->SetEnabled(enable_buttons);
 
   if (ui::MaterialDesignController::IsModeMaterial())
     return;
 
   if (no_match) {
     match_count_text_->SetBackgroundColor(kBackgroundColorNoMatch);
     match_count_text_->SetEnabledColor(kTextColorNoMatch);
   } else {
@@ skipping 42 matching lines @@
   SkColor text_color =
       theme->GetSystemColor(ui::NativeTheme::kColorId_TextfieldDefaultColor);
   match_count_text_->SetEnabledColor(SkColorSetA(text_color, 0x69));
   separator_->SetColor(SkColorSetA(text_color, 0x26));
 }
 
 SkColor FindBarView::GetTextColorForIcon() {
   return GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_TextfieldDefaultColor);
 }