Fixed focus requesting for the findbar.

chrome/browser/ui/views/find_bar_view.cc

 // Copyright (c) 2010 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/views/find_bar_view.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/find_bar_controller.h"
 #include "chrome/browser/find_bar_state.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/find_bar_host.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "gfx/canvas.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "views/background.h"
 #include "views/controls/button/image_button.h"
 #include "views/controls/label.h"
+#include "views/focus/focus_manager.h"
 #include "views/widget/widget.h"
 
 // The amount of whitespace to have before the find button.
 static const int kWhiteSpaceAfterMatchCountLabel = 1;
 
 // The margins around the search field and the close button.
 static const int kMarginLeftOfCloseButton = 3;
 static const int kMarginRightOfCloseButton = 7;
 static const int kMarginLeftOfFindTextfield = 12;
 
@@ skipping 177 matching lines @@
   }
 
   // The match_count label may have increased/decreased in size so we need to
   // do a layout and repaint the dialog so that the find text field doesn't
   // partially overlap the match-count label when it increases on no matches.
   Layout();
   SchedulePaint();
 }
 
 void FindBarView::SetFocusAndSelection(bool select_all) {
+#if defined(OS_CHROMEOS)
+  // TODO(altimofeev): this workaround is needed only when the FindBar was
+  // opened from the wrench menu (it also works in the accelerator case, but it
+  // is not really needed).
+
+  // Restore focus to allow the find bar's external focus tracker to save the
+  // view that should be activated later (the tracker is created after the
+  // wrench menu has received the focus).
+  find_text_->GetFocusManager()->RestoreFocusedView();
+  find_text_->RequestFocus();
+  // Storing is needed here because the view that has focus before the wrench
+  // menu activation will get focus just after the wrench menu is closed.
+  // The FindBar has it's own focus tracker, so it will focus the correct view
+  // on close.
+  find_text_->GetFocusManager()->StoreFocusedView();
+  // Request focus again since the call to StoreFocusedView unfocuses the view.
+#endif
   find_text_->RequestFocus();
   if (select_all && !find_text_->text().empty())
     find_text_->SelectAll();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // FindBarView, views::View overrides:
 
 void FindBarView::Paint(gfx::Canvas* canvas) {
   SkPaint paint;
@@ skipping 282 matching lines @@
 
 void FindBarView::OnThemeChanged() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   if (GetThemeProvider()) {
     close_button_->SetBackground(
         GetThemeProvider()->GetColor(BrowserThemeProvider::COLOR_TAB_TEXT),
         rb.GetBitmapNamed(IDR_CLOSE_BAR),
         rb.GetBitmapNamed(IDR_CLOSE_BAR_MASK));
   }
 }