Revise NativeWidgetWin focus hack; force focus on restore.

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 63 matching lines @@
       match_count_text_(NULL),
       focus_forwarder_view_(NULL),
       find_previous_button_(NULL),
       find_next_button_(NULL),
       close_button_(NULL),
       text_box_background_(NULL),
       text_box_background_left_(NULL) {
   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);
   find_text_->SetController(this);
   find_text_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_FIND));
 
   AddChildView(find_text_);
 
   match_count_text_ = new views::Label();
   match_count_text_->SetFont(rb.GetFont(ui::ResourceBundle::BaseFont));
@@ skipping 396 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() {
-}
-
-void FindBarView::SearchTextfieldView::RequestFocus() {
-  if (HasFocus())
-    return;
-  views::View::RequestFocus();
-  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));
   }
 }