Fix focus restore bug in find-in-bar

chrome/browser/views/find_bar_host.cc

 // Copyright (c) 2006-2009 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_host.h"
 
 #include "app/slide_animation.h"
 #include "base/keyboard_codes.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 35 matching lines @@
   host_.reset(CreateHost());
   host_->Init(GetNativeView(browser_view), gfx::Rect());
   host_->SetContentsView(view_);
 
   // Start listening to focus changes, so we can register and unregister our
   // own handler for Escape.
   focus_manager_ =
       views::FocusManager::GetFocusManagerForNativeView(host_->GetNativeView());
   if (focus_manager_) {
     focus_manager_->AddFocusChangeListener(this);
-
-    // Stores the currently focused view, and tracks focus changes so that we
-    // can restore focus when the find box is closed.
-    focus_tracker_.reset(new views::ExternalFocusTracker(view_,
-                                                         focus_manager_));
   } else {
     // In some cases (see bug http://crbug.com/17056) it seems we may not have
     // a focus manager.  Please reopen the bug if you hit this.
     NOTREACHED();
   }
 
   // Start the process of animating the opening of the window.
   animation_.reset(new SlideAnimation(this));
 }
 
 FindBarHost::~FindBarHost() {
   focus_manager_->RemoveFocusChangeListener(this);
   focus_tracker_.reset(NULL);
 }
 
 void FindBarHost::Show() {
+  // Stores the currently focused view, and tracks focus changes so that we can
+  // restore focus when the find box is closed.
+  focus_tracker_.reset(new views::ExternalFocusTracker(view_, focus_manager_));
+
   if (disable_animations_during_testing_) {
     animation_->Reset(1);
     MoveWindowIfNecessary(gfx::Rect(), true);
   } else {
     animation_->Reset();
     animation_->Show();
   }
 }
 
 void FindBarHost::SetFocusAndSelection() {
@@ skipping 286 matching lines @@
 
   RenderViewHost* render_view_host = contents->render_view_host();
 
   // Make sure we don't have a text field element interfering with keyboard
   // input. Otherwise Up and Down arrow key strokes get eaten. "Nom Nom Nom".
   render_view_host->ClearFocusedNode();
   NativeWebKeyboardEvent event = GetKeyboardEvent(contents, key_stroke);
   render_view_host->ForwardKeyboardEvent(event);
   return true;
 }