Revise NativeWidgetWin focus hack; force focus on restore.

chrome/browser/ui/views/find_bar_view.cc

Index: chrome/browser/ui/views/find_bar_view.cc
diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc
index 3732c60b885be2c113c3e3740f057ed02122d48c..57251bfae92f93197f4c4ed230f2342e171adde7 100644
--- a/chrome/browser/ui/views/find_bar_view.cc
+++ b/chrome/browser/ui/views/find_bar_view.cc
@@ -81,7 +81,7 @@ FindBarView::FindBarView(FindBarHost* host)
   set_id(VIEW_ID_FIND_IN_PAGE);
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
-  find_text_ = new SearchTextfieldView();
+  find_text_ = new views::Textfield();
   find_text_->set_id(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD);
   find_text_->SetFont(rb.GetFont(ui::ResourceBundle::BaseFont));
   find_text_->set_default_width_in_chars(kDefaultCharWidth);
@@ -498,19 +498,6 @@ bool FindBarView::FocusForwarderView::OnMousePressed(
   return true;
 }
 
-FindBarView::SearchTextfieldView::SearchTextfieldView() {
-}
-
-FindBarView::SearchTextfieldView::~SearchTextfieldView() {
-}
-
-void FindBarView::SearchTextfieldView::RequestFocus() {
-  if (HasFocus())
-    return;
-  views::View::RequestFocus();
-  SelectAll(true);

[Finnur, 2013/04/16 18:11:28]

I believe this CL regresses a long standing Find in page behavior.

Repro:
1) Open Chrome (one tab open).
2) Search for 'a'.
3) Open another tab.
4) Search for 'b' in that tab.
5) Set focus to the Omnibox.
6) Switch to tab 'a'.
7) Make sure the Find box is focused *and* 'a' is highlighted (so you can
overwrite the Find query).

There used to be an interactive test covering this (FocusRestoreOnTabSwitch),
but it got disabled due to flakiness. Btw: it can be deflaked by adding a call
to:
  browser()->tab_strip_model()->ActivateTabAt(0, true);
... right before the first GetFindSelectedText() call.

[msw, 2013/04/17 07:12:52]

Thanks, Finnur! I filed http://crbug.com/232290 and have a fix in progress.

-}
-
 FindBarHost* FindBarView::find_bar_host() const {
   return static_cast<FindBarHost*>(host());
 }