commit 0c96668965e17a98f29b6862468783e5a04af0d7
author msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Aug 02 18:22:10 2011
committer msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Aug 02 18:22:10 2011
tree 0386d0b802abcb6bc0c143648bdbfaaea6cdb154
parent 134efc37e03e2d8da955f855533fbb5c7c6177f1

Nix GetFocusManagerForNativeView|Window.
Use Widget|View::GetFocusManager instead.
Use Widget::Get[TopLevel]WidgetForNativeView|Window as necessary.

BUG=88718
TEST=none

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

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

chrome/browser/browser_focus_uitest.cc

diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc
index 303f5e8d..cd23955 100644
--- a/chrome/browser/browser_focus_uitest.cc
+++ b/chrome/browser/browser_focus_uitest.cc
@@ -246,12 +246,13 @@
   browser2->window()->Show();
   ui_test_utils::NavigateToURL(browser2, url);
 
-  HWND hwnd2 = reinterpret_cast<HWND>(browser2->window()->GetNativeHandle());
+  gfx::NativeWindow window2 = browser2->window()->GetNativeHandle();
   BrowserView* browser_view2 =
-      BrowserView::GetBrowserViewForNativeWindow(hwnd2);
+      BrowserView::GetBrowserViewForNativeWindow(window2);
   ASSERT_TRUE(browser_view2);
-  views::FocusManager* focus_manager2 =
-      views::FocusManager::GetFocusManagerForNativeView(hwnd2);
+  views::Widget* widget2 = views::Widget::GetWidgetForNativeWindow(window2);
+  ASSERT_TRUE(widget2);
+  views::FocusManager* focus_manager2 = widget2->GetFocusManager();
   ASSERT_TRUE(focus_manager2);
   EXPECT_EQ(browser_view2->GetTabContentsContainerView(),
             focus_manager2->GetFocusedView());
@@ -264,9 +265,9 @@
 
   // Switch back to the second browser, focus should still be on the page.
   browser2->window()->Activate();
-  EXPECT_EQ(NULL,
-            views::FocusManager::GetFocusManagerForNativeView(
-                browser()->window()->GetNativeHandle())->GetFocusedView());
+  views::Widget* widget = views::Widget::GetWidgetForNativeWindow(window);
+  ASSERT_TRUE(widget);
+  EXPECT_EQ(NULL, widget->GetFocusManager()->GetFocusedView());
   EXPECT_EQ(browser_view2->GetTabContentsContainerView(),
             focus_manager2->GetFocusedView());