Fixed focus requesting for the findbar.

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 2920f2a95d137ebc9a1c37ca66968f6d944a76eb..edcf56cf98b9acd57c23124acb8ffbee87228709 100644
--- a/chrome/browser/ui/views/find_bar_view.cc
+++ b/chrome/browser/ui/views/find_bar_view.cc
@@ -26,6 +26,7 @@
 #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.
@@ -223,7 +224,13 @@ void FindBarView::UpdateForResult(const FindNotificationDetails& result,
 }
 
 void FindBarView::SetFocusAndSelection(bool select_all) {
+  DCHECK(find_text_);

[Finnur, 2010/11/15 14:49:12]

This is redundant and just adds cruft to debug builds. The code is going to
crash on the next line anyway, you don't need a DCHECK to tell you that.

[altimofeev, 2010/11/15 15:36:19]

Done.

   find_text_->RequestFocus();
+  // Storing is needed here because view that has focus before wrench menu
+  // activation will be activated just after wrench menu is closed. FindBar
+  // has it's own focus tracker, so it will focus correct view on close.

[Finnur, 2010/11/15 14:49:12]

nit: I count four instances of the word 'the' being missing here (view, wrench
menu, wrench menu, view).

[altimofeev, 2010/11/15 15:36:19]

Thanks, will try to improve my grammar.

+  DCHECK(find_text_->GetFocusManager());

[Finnur, 2010/11/15 14:49:12]

Same here (don't need the DCHECK)

[altimofeev, 2010/11/15 15:36:19]

Done.

+  find_text_->GetFocusManager()->StoreFocusedView();

[Finnur, 2010/11/15 14:49:12]

Make sure the following use case works (I think you haven't broken it, but just
to make sure):

1) With two tabs open, open find window (ctrl-F or wrench)
2) Set focus to the omnibox
3) switch to the other tab
4) switch back.

Focus should not be restored to the Find box. It should be restored to where
focus was when you left the tab.

[altimofeev, 2010/11/15 15:36:19]

I have tried your use case. The focus behaves as it should.

   if (select_all && !find_text_->text().empty())
     find_text_->SelectAll();
 }