Relanding focus manager refactoring

chrome/browser/views/first_run_bubble.cc

 // Copyright (c) 2006-2008 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/first_run_bubble.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/win_util.h"
 #include "chrome/browser/browser.h"
@@ skipping 325 matching lines @@
   if (::IsWindowEnabled(GetParent()))
     InfoBubble::OnActivate(action, minimized, window);
 }
 
 void FirstRunBubble::InfoBubbleClosing(InfoBubble* info_bubble,
                                        bool closed_by_escape) {
   // Make sure our parent window is re-enabled.
   if (!IsWindowEnabled(GetParent()))
     ::EnableWindow(GetParent(), true);
   enable_window_method_factory_.RevokeAll();
-  views::FocusManager* focus_manager =
-      views::FocusManager::GetFocusManager(GetNativeView());
-  focus_manager->RemoveFocusChangeListener(view_);
+  GetFocusManager()->RemoveFocusChangeListener(view_);
 }
 
 // static
 FirstRunBubble* FirstRunBubble::Show(Profile* profile, views::Window* parent,
                                      const gfx::Rect& position_relative_to,
                                      bool use_OEM_bubble) {
   FirstRunBubble* window = new FirstRunBubble();
   FirstRunBubbleViewBase* view = NULL;
   if (use_OEM_bubble)
     view = new FirstRunOEMBubbleView(window, profile);
   else
     view = new FirstRunBubbleView(window, profile);
   window->SetDelegate(window);
   window->set_view(view);
   window->Init(parent, position_relative_to, view);
   window->ShowWindow(SW_SHOW);
-  views::FocusManager* focus_manager =
-      views::FocusManager::GetFocusManager(window->GetNativeView());
-  focus_manager->AddFocusChangeListener(view);
+  window->GetFocusManager()->AddFocusChangeListener(view);
   view->BubbleShown();
   return window;
 }
 
 void FirstRunBubble::EnableParent() {
   ::EnableWindow(GetParent(), true);
   // Reactivate the FirstRunBubble so it responds to OnActivate messages.
   SetWindowPos(GetParent(), 0, 0, 0, 0,
                SWP_NOSIZE | SWP_NOMOVE | SWP_NOREDRAW | SWP_SHOWWINDOW);
 }