Relanding focus manager refactoring with build fix, see:http://codereview.chromium.org/125148BUG=NoneTEST=NoneTBR=ben

Review URL: http://codereview.chromium.org/141013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18889 0039d316-1c4b-4281-b951-d872f2087c98

25 files changed, 52 insertions, 96 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
index 03e7824..ed4237b 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
@@ -1610,8 +1610,7 @@ void AutocompleteEditViewWin::OnPaste() {
 }
 
 void AutocompleteEditViewWin::OnSetFocus(HWND focus_wnd) {
-  views::FocusManager* focus_manager =
-      views::FocusManager::GetFocusManager(m_hWnd);
+  views::FocusManager* focus_manager = parent_view_->GetFocusManager();
   if (focus_manager) {
     // Notify the FocusManager that the focused view is now the location bar
     // (our parent view).
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index bcfd7a5..8432fee 100755
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -1729,7 +1729,7 @@ void AutomationProvider::GetFocusedViewID(int handle, int* view_id) {
   if (window_tracker_->ContainsHandle(handle)) {
     HWND hwnd = window_tracker_->GetResource(handle);
     views::FocusManager* focus_manager =
-        views::FocusManager::GetFocusManager(hwnd);
+        views::FocusManager::GetFocusManagerForNativeView(hwnd);
     DCHECK(focus_manager);
     views::View* focused_view = focus_manager->GetFocusedView();
     if (focused_view)
diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc
index 3681c1b..8aebfcf 100644
--- a/chrome/browser/browser_focus_uitest.cc
+++ b/chrome/browser/browser_focus_uitest.cc
@@ -108,7 +108,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, BrowsersRememberFocus) {
   BrowserView* browser_view = BrowserView::GetBrowserViewForNativeWindow(hwnd);
   ASSERT_TRUE(browser_view);
   views::FocusManager* focus_manager =
-      views::FocusManager::GetFocusManager(hwnd);
+      views::FocusManager::GetFocusManagerForNativeView(hwnd);
   ASSERT_TRUE(focus_manager);
 
   EXPECT_EQ(browser_view->GetTabContentsContainerView(),
@@ -149,7 +149,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, BrowsersRememberFocus) {
       BrowserView::GetBrowserViewForNativeWindow(hwnd2);
   ASSERT_TRUE(browser_view2);
   views::FocusManager* focus_manager2 =
-      views::FocusManager::GetFocusManager(hwnd2);
+      views::FocusManager::GetFocusManagerForNativeView(hwnd2);
   ASSERT_TRUE(focus_manager2);
   EXPECT_EQ(browser_view2->GetTabContentsContainerView(),
             focus_manager2->GetFocusedView());
@@ -183,13 +183,13 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, TabsRememberFocus) {
   ASSERT_TRUE(browser_view);
 
   views::FocusManager* focus_manager =
-      views::FocusManager::GetFocusManager(hwnd);
+      views::FocusManager::GetFocusManagerForNativeView(hwnd);
   ASSERT_TRUE(focus_manager);
 
   // Create several tabs.
   for (int i = 0; i < 4; ++i) {
-    browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED, true, -1, false,
-                             NULL);
+    browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED, true, -1,
+                             false, NULL);
   }
 
   // Alternate focus for the tab.
@@ -283,7 +283,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, LocationBarLockFocus) {
   HWND hwnd = reinterpret_cast<HWND>(browser()->window()->GetNativeHandle());
   BrowserView* browser_view = BrowserView::GetBrowserViewForNativeWindow(hwnd);
   views::FocusManager* focus_manager =
-      views::FocusManager::GetFocusManager(hwnd);
+      views::FocusManager::GetFocusManagerForNativeView(hwnd);
 
   // Click on the location bar.
   LocationBarView* location_bar = browser_view->GetLocationBarView();
@@ -311,7 +311,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FocusTraversal) {
   HWND hwnd = reinterpret_cast<HWND>(browser()->window()->GetNativeHandle());
   BrowserView* browser_view = BrowserView::GetBrowserViewForNativeWindow(hwnd);
   views::FocusManager* focus_manager =
-      views::FocusManager::GetFocusManager(hwnd);
+      views::FocusManager::GetFocusManagerForNativeView(hwnd);
 
   // Click on the location bar.
   LocationBarView* location_bar = browser_view->GetLocationBarView();
@@ -401,7 +401,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FocusTraversalOnInterstitial) {
   HWND hwnd = reinterpret_cast<HWND>(browser()->window()->GetNativeHandle());
   BrowserView* browser_view = BrowserView::GetBrowserViewForNativeWindow(hwnd);
   views::FocusManager* focus_manager =
-      views::FocusManager::GetFocusManager(hwnd);
+      views::FocusManager::GetFocusManagerForNativeView(hwnd);
 
   // Focus should be on the page.
   EXPECT_EQ(browser_view->GetTabContentsContainerView(),
@@ -496,7 +496,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, InterstitialFocus) {
   HWND hwnd = reinterpret_cast<HWND>(browser()->window()->GetNativeHandle());
   BrowserView* browser_view = BrowserView::GetBrowserViewForNativeWindow(hwnd);
   views::FocusManager* focus_manager =
-      views::FocusManager::GetFocusManager(hwnd);
+      views::FocusManager::GetFocusManagerForNativeView(hwnd);
 
   // Page should have focus.
   EXPECT_EQ(browser_view->GetTabContentsContainerView(),
@@ -541,7 +541,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FindFocusTest) {
   HWND hwnd = reinterpret_cast<HWND>(browser()->window()->GetNativeHandle());
   BrowserView* browser_view = BrowserView::GetBrowserViewForNativeWindow(hwnd);
   views::FocusManager* focus_manager =
-      views::FocusManager::GetFocusManager(hwnd);
+      views::FocusManager::GetFocusManagerForNativeView(hwnd);
   LocationBarView* location_bar = browser_view->GetLocationBarView();
 
   // Press Ctrl+F, which will make the Find box open and request focus.
@@ -613,7 +613,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, TabInitialFocus) {
   BrowserView* browser_view = BrowserView::GetBrowserViewForNativeWindow(hwnd);
   ASSERT_TRUE(browser_view);
   views::FocusManager* focus_manager =
-      views::FocusManager::GetFocusManager(hwnd);
+      views::FocusManager::GetFocusManagerForNativeView(hwnd);
   ASSERT_TRUE(focus_manager);
 
   // Open the history tab, focus should be on the tab contents.
diff --git a/chrome/browser/external_tab_container.cc b/chrome/browser/external_tab_container.cc
index 7da0be0..d7e4836 100644
--- a/chrome/browser/external_tab_container.cc
+++ b/chrome/browser/external_tab_container.cc
@@ -53,11 +53,12 @@ bool ExternalTabContainer::Init(Profile* profile,
   }
 
   set_window_style(WS_POPUP);
-  views::WidgetWin::Init(NULL, bounds, true);
+  views::WidgetWin::Init(NULL, bounds);
   if (!IsWindow()) {
     NOTREACHED();
     return false;
   }
+  // TODO(jcampan): limit focus traversal to contents.
 
   // We don't ever remove the prop because the lifetime of this object
   // is the same as the lifetime of the window
diff --git a/chrome/browser/first_run_win.cc b/chrome/browser/first_run_win.cc
index 136350c..6f1d4a5 100644
--- a/chrome/browser/first_run_win.cc
+++ b/chrome/browser/first_run_win.cc
@@ -684,7 +684,7 @@ class TryChromeDialog : public views::ButtonListener,
     popup->set_delete_on_destroy(true);
     popup->set_window_style(WS_POPUP | WS_CLIPCHILDREN);
     popup->set_window_ex_style(WS_EX_TOOLWINDOW);
-    popup->Init(NULL, pos, true);
+    popup->Init(NULL, pos);
 
     views::RootView* root_view = popup->GetRootView();
     // The window color is a tiny bit off-white.
diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc
index e5091d6..5a75f50 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_win.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc
@@ -406,7 +406,7 @@ void RenderWidgetHostViewWin::Focus() {
 
 void RenderWidgetHostViewWin::Blur() {
   views::FocusManager* focus_manager =
-      views::FocusManager::GetFocusManager(GetParent());
+      views::FocusManager::GetFocusManagerForNativeView(m_hWnd);
   // We don't have a FocusManager if we are hidden.
   if (focus_manager && render_widget_host_->CanBlur())
     focus_manager->ClearFocus();
diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_win.cc b/chrome/browser/views/autocomplete/autocomplete_popup_win.cc
index 02d3118..accdbd5 100644
--- a/chrome/browser/views/autocomplete/autocomplete_popup_win.cc
+++ b/chrome/browser/views/autocomplete/autocomplete_popup_win.cc
@@ -28,7 +28,9 @@ void AutocompletePopupWin::Init(AutocompleteEditViewWin* edit_view,
                                 views::View* contents) {
   // Create the popup
   WidgetWin::Init(edit_view->parent_view()->GetWidget()->GetNativeView(),
-                  contents_->GetPopupBounds(), false);
+                  contents_->GetPopupBounds());
+  // The contents is owned by the AutocompleteEditViewWin.
+  contents_->SetParentOwned(false);
   // The contents is owned by the LocationBarView.
   contents_->SetParentOwned(false);
   SetContentsView(contents_);
diff --git a/chrome/browser/views/blocked_popup_container_view_win.cc b/chrome/browser/views/blocked_popup_container_view_win.cc
index 8e2837e..29240de 100644
--- a/chrome/browser/views/blocked_popup_container_view_win.cc
+++ b/chrome/browser/views/blocked_popup_container_view_win.cc
@@ -398,7 +398,7 @@ BlockedPopupContainerViewWin::BlockedPopupContainerViewWin(
 
   set_window_style(WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN);
   WidgetWin::Init(GetModel()->GetConstrainingContents(NULL)->GetNativeView(),
-                  gfx::Rect(), false);
+                  gfx::Rect());
   SetContentsView(container_view_);
   SetPosition();
 }
diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc
index 9a2a8f6..b81d0ab 100644
--- a/chrome/browser/views/bookmark_bubble_view.cc
+++ b/chrome/browser/views/bookmark_bubble_view.cc
@@ -182,9 +182,7 @@ void BookmarkBubbleView::DidChangeBounds(const gfx::Rect& previous,
 
 void BookmarkBubbleView::BubbleShown() {
   DCHECK(GetWidget());
-  views::FocusManager* focus_manager =
-      views::FocusManager::GetFocusManager(GetWidget()->GetNativeView());
-  focus_manager->RegisterAccelerator(
+  GetFocusManager()->RegisterAccelerator(
       views::Accelerator(VK_RETURN, false, false, false), this);
 
   title_tf_->RequestFocus();
diff --git a/chrome/browser/views/browser_bubble_win.cc b/chrome/browser/views/browser_bubble_win.cc
index 7b47fe9..e72545b 100644
--- a/chrome/browser/views/browser_bubble_win.cc
+++ b/chrome/browser/views/browser_bubble_win.cc
@@ -24,9 +24,7 @@ void BrowserBubble::InitPopup() {
 #endif
   // A focus manager is necessary if you want to be able to handle various
   // mouse events properly.
-  pop->Init(frame_native_view_,
-            bounds_,
-            true);  // Give the widget a focus manager.
+  pop->Init(frame_native_view_, bounds_);
   pop->SetContentsView(view_);
   popup_.reset(pop);
   Reposition();
diff --git a/chrome/browser/views/constrained_window_win.cc b/chrome/browser/views/constrained_window_win.cc
index f641f6f..03759a3 100644
--- a/chrome/browser/views/constrained_window_win.cc
+++ b/chrome/browser/views/constrained_window_win.cc
@@ -638,48 +638,13 @@ ConstrainedWindowWin::ConstrainedWindowWin(
 void ConstrainedWindowWin::ActivateConstrainedWindow() {
   // Other pop-ups are simply moved to the front of the z-order.
   SetWindowPos(HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
-
-  // Store the focus of our parent focus manager so we can restore it when we
-  // close.
-  views::FocusManager* focus_manager =
-      views::FocusManager::GetFocusManager(GetNativeView());
-  DCHECK(focus_manager);
-  focus_manager = focus_manager->GetParentFocusManager();
-  if (focus_manager) {
-    // We could not have a parent focus manager if the ConstrainedWindow is
-    // displayed in a tab that is not currently selected.
-    // TODO(jcampan): we should store the ConstrainedWindow active events in
-    // that case and replay them when the TabContents becomes selected.
-    focus_manager->StoreFocusedView();
-
-    // Give our window the focus so we get keyboard messages.
-    ::SetFocus(GetNativeView());
-  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ConstrainedWindowWin, views::WidgetWin overrides:
 
 void ConstrainedWindowWin::OnDestroy() {
-  // We do this here, rather than |Close|, since the window may be destroyed in
-  // a way other than by some other component calling Close, e.g. by the native
-  // window hierarchy closing. We are guaranteed to receive a WM_DESTROY
-  // message regardless of how the window is closed.
-  // Note that when we get this message, the focus manager of the
-  // ConstrainedWindow has already been destroyed (by the processing of
-  // WM_DESTROY in FocusManager).  So the FocusManager we retrieve here is the
-  // parent one (the one from the top window).
-  views::FocusManager* focus_manager =
-      views::FocusManager::GetFocusManager(GetNativeView());
-  if (focus_manager) {
-    // We may not have a focus manager if:
-    // - we are hidden when closed (the TabContent would be detached).
-    // - the tab has been closed and we are closed as a result.
-    // TODO(jcampan): when hidden, we should modify the stored focus of the tab
-    // so when it becomes visible again we retrieve the focus appropriately.
-    if (!focus_restoration_disabled_)
-      focus_manager->RestoreFocusedView();
-  }
+  // TODO(jcampan): figure out focus restoration
 
   // Make sure we call super so that it can do its cleanup.
   WindowWin::OnDestroy();
diff --git a/chrome/browser/views/download_started_animation_win.cc b/chrome/browser/views/download_started_animation_win.cc
index 4de387e..ec71683 100644
--- a/chrome/browser/views/download_started_animation_win.cc
+++ b/chrome/browser/views/download_started_animation_win.cc
@@ -106,7 +106,7 @@ DownloadStartedAnimationWin::DownloadStartedAnimationWin(
   popup_->set_window_ex_style(WS_EX_LAYERED | WS_EX_TOOLWINDOW |
                               WS_EX_TRANSPARENT);
   popup_->SetOpacity(0x00);
-  popup_->Init(tab_contents_->GetNativeView(), rc, false);
+  popup_->Init(tab_contents_->GetNativeView(), rc);
   popup_->SetContentsView(this);
   Reposition();
   popup_->Show();
diff --git a/chrome/browser/views/find_bar_win.cc b/chrome/browser/views/find_bar_win.cc
index 51e1b20..4272ef7 100644
--- a/chrome/browser/views/find_bar_win.cc
+++ b/chrome/browser/views/find_bar_win.cc
@@ -95,12 +95,13 @@ FindBarWin::FindBarWin(BrowserView* browser_view)
 
   // 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
diff --git a/chrome/browser/views/find_bar_win_browsertest.cc b/chrome/browser/views/find_bar_win_browsertest.cc
index 67b05ad..cf55acf 100644
--- a/chrome/browser/views/find_bar_win_browsertest.cc
+++ b/chrome/browser/views/find_bar_win_browsertest.cc
@@ -557,8 +557,9 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, AcceleratorRestoring) {
   GURL url = server->TestServerPageW(kSimplePage);
   ui_test_utils::NavigateToURL(browser(), url);
 
-  views::FocusManager* focus_manager = views::FocusManager::GetFocusManager(
-      browser()->window()->GetNativeHandle());
+  gfx::NativeView browser_view = browser()->window()->GetNativeHandle();
+  views::FocusManager* focus_manager =
+      views::FocusManager::GetFocusManagerForNativeView(browser_view);
 
   // See where Escape is registered.
   views::Accelerator escape(VK_ESCAPE, false, false, false);
diff --git a/chrome/browser/views/first_run_bubble.cc b/chrome/browser/views/first_run_bubble.cc
index ba8edb2..b79c665 100644
--- a/chrome/browser/views/first_run_bubble.cc
+++ b/chrome/browser/views/first_run_bubble.cc
@@ -343,9 +343,7 @@ void FirstRunBubble::InfoBubbleClosing(InfoBubble* info_bubble,
   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
@@ -362,9 +360,7 @@ FirstRunBubble* FirstRunBubble::Show(Profile* profile, views::Window* parent,
   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;
 }
diff --git a/chrome/browser/views/fullscreen_exit_bubble.cc b/chrome/browser/views/fullscreen_exit_bubble.cc
index 854c3dd..907a791 100644
--- a/chrome/browser/views/fullscreen_exit_bubble.cc
+++ b/chrome/browser/views/fullscreen_exit_bubble.cc
@@ -144,7 +144,7 @@ FullscreenExitBubble::FullscreenExitBubble(
   popup_->set_window_ex_style(WS_EX_LAYERED | WS_EX_TOOLWINDOW |
                               l10n_util::GetExtendedTooltipStyles());
   popup_->SetOpacity(static_cast<unsigned char>(0xff * kOpacity));
-  popup_->Init(frame->GetNativeView(), GetPopupRect(false), false);
+  popup_->Init(frame->GetNativeView(), GetPopupRect(false));
   popup_->SetContentsView(view_);
   popup_->Show();  // This does not activate the popup.
 
diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc
index 908aa54..031caaf 100644
--- a/chrome/browser/views/info_bubble.cc
+++ b/chrome/browser/views/info_bubble.cc
@@ -133,7 +133,7 @@ void InfoBubble::Init(views::Window* parent,
       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
@@ -155,11 +155,9 @@ void InfoBubble::Init(views::Window* parent,
 
 #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),
diff --git a/chrome/browser/views/infobars/infobars.cc b/chrome/browser/views/infobars/infobars.cc
index 12fe42e..3e19bf7 100644
--- a/chrome/browser/views/infobars/infobars.cc
+++ b/chrome/browser/views/infobars/infobars.cc
@@ -207,9 +207,8 @@ void InfoBar::InfoBarAdded() {
   // 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
 }
diff --git a/chrome/browser/views/shelf_item_dialog.cc b/chrome/browser/views/shelf_item_dialog.cc
index ade3be7..12868f6 100644
--- a/chrome/browser/views/shelf_item_dialog.cc
+++ b/chrome/browser/views/shelf_item_dialog.cc
@@ -476,8 +476,7 @@ bool ShelfItemDialog::AcceleratorPressed(
   if (accelerator.GetKeyCode() == VK_ESCAPE) {
     window()->Close();
   } else if (accelerator.GetKeyCode() == VK_RETURN) {
-    views::FocusManager* fm = views::FocusManager::GetFocusManager(
-        GetWidget()->GetNativeView());
+    views::FocusManager* fm = GetFocusManager();
     if (fm->GetFocusedView() == url_table_) {
       // Return on table behaves like a double click.
       OnDoubleClick();
diff --git a/chrome/browser/views/status_bubble_views.cc b/chrome/browser/views/status_bubble_views.cc
index 49462bf..76c3ab9 100644
--- a/chrome/browser/views/status_bubble_views.cc
+++ b/chrome/browser/views/status_bubble_views.cc
@@ -481,7 +481,7 @@ void StatusBubbleViews::Init() {
                                WS_EX_TRANSPARENT |
                                l10n_util::GetExtendedTooltipStyles());
     popup->SetOpacity(0x00);
-    popup->Init(frame_->GetNativeView(), gfx::Rect(), false);
+    popup->Init(frame_->GetNativeView(), gfx::Rect());
     popup->SetContentsView(view_);
     Reposition();
     popup->Show();
diff --git a/chrome/browser/views/tab_contents/tab_contents_view_win.cc b/chrome/browser/views/tab_contents/tab_contents_view_win.cc
index 1b7fa80..2080cff 100755
--- a/chrome/browser/views/tab_contents/tab_contents_view_win.cc
+++ b/chrome/browser/views/tab_contents/tab_contents_view_win.cc
@@ -73,7 +73,7 @@ void TabContentsViewWin::CreateView() {
   // Since we create these windows parented to the desktop window initially, we
   // don't want to create them initially visible.
   set_window_style(WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS);
-  WidgetWin::Init(GetDesktopWindow(), gfx::Rect(), false);
+  WidgetWin::Init(GetDesktopWindow(), gfx::Rect());
 
   // Remove the root view drop target so we can register our own.
   RevokeDragDrop(GetNativeView());
@@ -233,7 +233,7 @@ void TabContentsViewWin::SizeContents(const gfx::Size& size) {
 
 void TabContentsViewWin::Focus() {
   views::FocusManager* focus_manager =
-      views::FocusManager::GetFocusManager(GetNativeView());
+      views::FocusManager::GetFocusManagerForNativeView(GetNativeView());
 
   if (tab_contents()->interstitial_page()) {
     tab_contents()->interstitial_page()->Focus();
@@ -269,7 +269,7 @@ void TabContentsViewWin::StoreFocus() {
     view_storage->RemoveView(last_focused_view_storage_id_);
 
   views::FocusManager* focus_manager =
-      views::FocusManager::GetFocusManager(GetNativeView());
+      views::FocusManager::GetFocusManagerForNativeView(GetNativeView());
   if (focus_manager) {
     // |focus_manager| can be NULL if the tab has been detached but still
     // exists.
@@ -301,7 +301,7 @@ void TabContentsViewWin::RestoreFocus() {
     SetInitialFocus();
   } else {
     views::FocusManager* focus_manager =
-        views::FocusManager::GetFocusManager(GetNativeView());
+        views::FocusManager::GetFocusManagerForNativeView(GetNativeView());
 
     // If you hit this DCHECK, please report it to Jay (jcampan).
     DCHECK(focus_manager != NULL) << "No focus manager when restoring focus.";
@@ -333,7 +333,7 @@ void TabContentsViewWin::GotFocus() {
 void TabContentsViewWin::TakeFocus(bool reverse) {
   if (!tab_contents()->delegate()->TakeFocus(reverse)) {
     views::FocusManager* focus_manager =
-        views::FocusManager::GetFocusManager(GetNativeView());
+        views::FocusManager::GetFocusManagerForNativeView(GetNativeView());
 
     // We may not have a focus manager if the tab has been switched before this
     // message arrived.
@@ -357,7 +357,7 @@ void TabContentsViewWin::HandleKeyboardEvent(
   // a keyboard shortcut that we have to process.
   if (event.type == WebInputEvent::RawKeyDown) {
     views::FocusManager* focus_manager =
-        views::FocusManager::GetFocusManager(GetNativeView());
+        views::FocusManager::GetFocusManagerForNativeView(GetNativeView());
     // We may not have a focus_manager at this point (if the tab has been
     // switched by the time this message returned).
     if (focus_manager) {
diff --git a/chrome/browser/views/tabs/dragged_tab_controller.cc b/chrome/browser/views/tabs/dragged_tab_controller.cc
index b4fea1d..adf7903 100644
--- a/chrome/browser/views/tabs/dragged_tab_controller.cc
+++ b/chrome/browser/views/tabs/dragged_tab_controller.cc
@@ -198,7 +198,7 @@ class DraggedTabController::DockDisplayer : public AnimationDelegate {
     popup->set_window_ex_style(WS_EX_LAYERED | WS_EX_TOOLWINDOW |
                                WS_EX_TOPMOST);
     popup->SetOpacity(0x00);
-    popup->Init(NULL, info.GetPopupRect(), false);
+    popup->Init(NULL, info.GetPopupRect());
     popup->SetContentsView(new DockView(info.type()));
     if (info.in_enable_area())
       animation_.Reset(1);
diff --git a/chrome/browser/views/tabs/dragged_tab_view.cc b/chrome/browser/views/tabs/dragged_tab_view.cc
index f3101d9..b77ace5 100644
--- a/chrome/browser/views/tabs/dragged_tab_view.cc
+++ b/chrome/browser/views/tabs/dragged_tab_view.cc
@@ -48,7 +48,7 @@ DraggedTabView::DraggedTabView(TabContents* datasource,
   container_->set_window_ex_style(
     WS_EX_LAYERED | WS_EX_TOPMOST | WS_EX_TOOLWINDOW);
   container_->set_can_update_layered_window(false);
-  container_->Init(NULL, gfx::Rect(0, 0, 0, 0), false);
+  container_->Init(NULL, gfx::Rect(0, 0, 0, 0));
   container_->SetContentsView(this);
 
   BOOL drag;
diff --git a/chrome/browser/views/tabs/native_view_photobooth_win.cc b/chrome/browser/views/tabs/native_view_photobooth_win.cc
index 430e009..6f78ea9 100644
--- a/chrome/browser/views/tabs/native_view_photobooth_win.cc
+++ b/chrome/browser/views/tabs/native_view_photobooth_win.cc
@@ -155,7 +155,7 @@ void NativeViewPhotoboothWin::CreateCaptureWindow(HWND initial_hwnd) {
   // WS_EX_TOOLWINDOW ensures the capture window doesn't produce a Taskbar
   // button.
   capture_window_->set_window_ex_style(WS_EX_LAYERED | WS_EX_TOOLWINDOW);
-  capture_window_->Init(NULL, capture_bounds, false);
+  capture_window_->Init(NULL, capture_bounds);
   // If the capture window isn't visible, blitting from the TabContents'
   // HWND's DC to the capture bitmap produces blankness.
   capture_window_->Show();
diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc
index d669be3..b5f0aae 100644
--- a/chrome/browser/views/tabs/tab_strip.cc
+++ b/chrome/browser/views/tabs/tab_strip.cc
@@ -1382,8 +1382,7 @@ TabStrip::DropInfo::DropInfo(int drop_index, bool drop_before, bool point_down)
 
   arrow_window->Init(
       NULL,
-      gfx::Rect(0, 0, drop_indicator_width, drop_indicator_height),
-      true);
+      gfx::Rect(0, 0, drop_indicator_width, drop_indicator_height));
   arrow_window->SetContentsView(arrow_view);
 #else
   NOTIMPLEMENTED();