Relanding focus manager refactoring

chrome/browser/views/infobars/infobars.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/infobars/infobars.h"
 
 #include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/slide_animation.h"
@@ skipping 185 matching lines @@
 
 void InfoBar::InfoBarAdded() {
   // The container_ pointer must be set before adding to the view hierarchy.
   DCHECK(container_);
 #if defined(OS_WIN)
   // When we're added to a view hierarchy within a widget, we create an
   // external focus tracker to track what was focused in case we obtain
   // focus so that we can restore focus when we're removed.
   views::Widget* widget = GetWidget();
   if (widget) {
-    focus_tracker_.reset(
-        new views::ExternalFocusTracker(this,
-            views::FocusManager::GetFocusManager(widget->GetNativeView())));
+    focus_tracker_.reset(new views::ExternalFocusTracker(this,
+                                                         GetFocusManager()));
   }
 #endif
 }
 
 void InfoBar::InfoBarRemoved() {
   DestroyFocusTracker(false);
   // NULL our container_ pointer so that if Animation::Stop results in
   // AnimationEnded being called, we do not try and delete ourselves twice.
   container_ = NULL;
   animation_->Stop();
@@ skipping 262 matching lines @@
 
 InfoBar* LinkInfoBarDelegate::CreateInfoBar() {
   return new LinkInfoBar(this);
 }
 
 // ConfirmInfoBarDelegate, InfoBarDelegate overrides: --------------------------
 
 InfoBar* ConfirmInfoBarDelegate::CreateInfoBar() {
   return new ConfirmInfoBar(this);
 }