Relanding focus manager refactoring

chrome/browser/views/info_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/info_bubble.h"
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/path.h"
 #include "app/resource_bundle.h"
 #include "chrome/browser/browser_window.h"
@@ skipping 115 matching lines @@
   SetUseLayeredBuffer(false);
   set_initial_class_style(
       (win_util::GetWinVersion() < win_util::WINVERSION_XP) ?
       0 : CS_DROPSHADOW);
 #endif
   content_view_ = CreateContentView(content);
   gfx::Rect bounds =
       content_view_->CalculateWindowBoundsAndAjust(position_relative_to);
 
 #if defined(OS_WIN)
-  WidgetWin::Init(parent->GetNativeWindow(), bounds, true);
+  WidgetWin::Init(parent->GetNativeWindow(), bounds);
 #else
   WidgetGtk::Init(GTK_WIDGET(parent->GetNativeWindow()), bounds, true);
 #endif
   SetContentsView(content_view_);
   // The preferred size may differ when parented. Ask for the bounds again
   // and if they differ reset the bounds.
   gfx::Rect parented_bounds =
       content_view_->CalculateWindowBoundsAndAjust(position_relative_to);
 
   if (bounds != parented_bounds) {
 #if defined(OS_WIN)
     SetWindowPos(NULL, parented_bounds.x(), parented_bounds.y(),
                  parented_bounds.width(), parented_bounds.height(),
                  SWP_NOACTIVATE | SWP_NOREDRAW | SWP_NOZORDER);
     // Invoke ChangeSize, otherwise layered window isn't updated correctly.
     ChangeSize(0, CSize(parented_bounds.width(), parented_bounds.height()));
 #endif
   }
 
 #if defined(OS_WIN)
   // Register the Escape accelerator for closing.
-  views::FocusManager* focus_manager =
-      views::FocusManager::GetFocusManager(GetNativeView());
-  focus_manager->RegisterAccelerator(views::Accelerator(VK_ESCAPE, false,
-                                                        false, false),
-                                     this);
+  GetFocusManager()->RegisterAccelerator(views::Accelerator(VK_ESCAPE, false,
+                                                            false, false),
+                                         this);
   // Set initial alpha value of the layered window.
   SetLayeredWindowAttributes(GetNativeView(),
                              RGB(0xFF, 0xFF, 0xFF),
                              kMinimumAlpha,
                              LWA_ALPHA);
 #endif
 
   NotificationService::current()->Notify(
       NotificationType::INFO_BUBBLE_CREATED,
       Source<InfoBubble>(this),
@@ skipping 276 matching lines @@
     x -= kArrowXOffset;
   else
     x = x + kArrowXOffset - pref.width();
   if (IsTop()) {
     y = position_relative_to.bottom() + kArrowToContentPadding;
   } else {
     y = position_relative_to.y() - kArrowToContentPadding - pref.height();
   }
   return gfx::Rect(x, y, pref.width(), pref.height());
 }