Relanding focus manager refactoring

chrome/browser/views/find_bar_win.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_win.h"
 
 #include "app/slide_animation.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/find_bar_controller.h"
@@ skipping 77 matching lines @@
 
 FindBarWin::FindBarWin(BrowserView* browser_view)
     : browser_view_(browser_view),
       find_dialog_animation_offset_(0),
       esc_accel_target_registered_(false),
       find_bar_controller_(NULL) {
   view_ = new FindBarView(this);
 
   // Initialize the host.
   host_.reset(new Host(this));
-  host_->Init(browser_view->GetWidget()->GetNativeView(), gfx::Rect(), false);
+  host_->Init(browser_view->GetWidget()->GetNativeView(), 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::GetFocusManager(host_->GetNativeView());
+  focus_manager_ =
+      views::FocusManager::GetFocusManagerForNativeView(host_->GetNativeView());
   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_));
 
   // Start the process of animating the opening of the window.
   animation_.reset(new SlideAnimation(this));
 }
 
@@ skipping 497 matching lines @@
     focus_tracker_.reset(NULL);
 }
 
 void FindBarWin::AudibleAlert() {
 #if defined(OS_WIN)
   MessageBeep(MB_OK);
 #else
   NOTIMPLEMENTED();
 #endif
 }