Replace find bar RequestFocus override with OnFocus.

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/string_util.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 480 matching lines @@
   }
 }
 
 bool FindBarView::FocusForwarderView::OnMousePressed(
     const ui::MouseEvent& event) {
   if (view_to_focus_on_mousedown_)
     view_to_focus_on_mousedown_->RequestFocus();
   return true;
 }
 
-FindBarView::SearchTextfieldView::SearchTextfieldView() {}
+FindBarView::SearchTextfieldView::SearchTextfieldView()
+    : select_all_on_focus_(true) {}
 
 FindBarView::SearchTextfieldView::~SearchTextfieldView() {}
 
-void FindBarView::SearchTextfieldView::RequestFocus() {
-  if (HasFocus())
-    return;
-  views::View::RequestFocus();
-  SelectAll(true);
+bool FindBarView::SearchTextfieldView::OnMousePressed(
+    const ui::MouseEvent& event) {
+  // Avoid temporarily selecting all the text on focus from a mouse press; this
+  // prevents flickering before setting a cursor or dragging to select text.
+  select_all_on_focus_ = false;
+  return views::Textfield::OnMousePressed(event);
+}
+
+void FindBarView::SearchTextfieldView::OnMouseReleased(
+    const ui::MouseEvent& event) {
+  views::Textfield::OnMouseReleased(event);
+  select_all_on_focus_ = true;
+}
+
+void FindBarView::SearchTextfieldView::OnFocus() {
+  views::Textfield::OnFocus();
+  if (select_all_on_focus_)
+    SelectAll(true);
 }
 
 FindBarHost* FindBarView::find_bar_host() const {
   return static_cast<FindBarHost*>(host());
 }
 
 void FindBarView::OnThemeChanged() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   if (GetThemeProvider()) {
     close_button_->SetBackground(
         GetThemeProvider()->GetColor(ThemeProperties::COLOR_TAB_TEXT),
         rb.GetImageSkiaNamed(IDR_CLOSE_1),
         rb.GetImageSkiaNamed(IDR_CLOSE_1_MASK));
   }
 }