Relanding focus manager refactoring

chrome/browser/browser_focus_uitest.cc

 // Copyright (c) 2009 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 "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/tab_contents/interstitial_page.h"
@@ skipping 90 matching lines @@
 
   // First we navigate to our test page.
   GURL url = server->TestServerPageW(kSimplePage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   // The focus should be on the Tab contents.
   HWND hwnd = reinterpret_cast<HWND>(browser()->window()->GetNativeHandle());
   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(),
             focus_manager->GetFocusedView());
 
   // Now hide the window, show it again, the focus should not have changed.
   // TODO(jcampan): retrieve the WidgetWin and show/hide on it instead of
   // using Windows API.
   ::ShowWindow(hwnd, SW_HIDE);
   ::ShowWindow(hwnd, SW_SHOW);
@@ skipping 20 matching lines @@
   ASSERT_TRUE(browser2);
   browser2->tabstrip_model()->delegate()->AddBlankTab(true);
   browser2->window()->Show();
   ui_test_utils::NavigateToURL(browser2, url);
 
   HWND hwnd2 = reinterpret_cast<HWND>(browser2->window()->GetNativeHandle());
   BrowserView* browser_view2 =
       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());
 
   // Switch to the 1st browser window, focus should still be on the location
   // bar and the second browser should have nothing focused.
   browser()->window()->Activate();
   EXPECT_EQ(location_bar, focus_manager->GetFocusedView());
   EXPECT_EQ(NULL, focus_manager2->GetFocusedView());
 
@@ skipping 13 matching lines @@
 
   // First we navigate to our test page.
   GURL url = server->TestServerPageW(kSimplePage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   HWND hwnd = reinterpret_cast<HWND>(browser()->window()->GetNativeHandle());
   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);
 
   // 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.
   const bool kFocusPage[3][5] = {
     { true, true, true, true, false },
     { false, false, false, false, false },
     { false, true, false, true, false }
   };
 
   for (int i = 1; i < 3; i++) {
@@ skipping 73 matching lines @@
 IN_PROC_BROWSER_TEST_F(BrowserFocusTest, LocationBarLockFocus) {
   HTTPTestServer* server = StartHTTPServer();
 
   // Open the page that steals focus.
   GURL url = server->TestServerPageW(kStealFocusPage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   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();
   ui_controls::MoveMouseToCenterAndPress(location_bar,
                                          ui_controls::LEFT,
                                          ui_controls::DOWN | ui_controls::UP,
                                          new MessageLoop::QuitTask());
   ui_test_utils::RunMessageLoop();
 
   // Wait for the page to steal focus.
   ::Sleep(2000);
 
   // Make sure the location bar is still focused.
   EXPECT_EQ(location_bar, focus_manager->GetFocusedView());
 }
 
 // Focus traversal on a regular page.
 IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FocusTraversal) {
   HTTPTestServer* server = StartHTTPServer();
 
   // First we navigate to our test page.
   GURL url = server->TestServerPageW(kTypicalPage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   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();
   ui_controls::MoveMouseToCenterAndPress(location_bar,
                                          ui_controls::LEFT,
                                          ui_controls::DOWN | ui_controls::UP,
                                          new MessageLoop::QuitTask());
   ui_test_utils::RunMessageLoop();
 
   const char* kExpElementIDs[] = {
@@ skipping 69 matching lines @@
 IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FocusTraversalOnInterstitial) {
   HTTPTestServer* server = StartHTTPServer();
 
   // First we navigate to our test page.
   GURL url = server->TestServerPageW(kSimplePage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   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(),
             focus_manager->GetFocusedView());
 
   // Let's show an interstitial.
   TestInterstitialPage* interstitial_page =
       new TestInterstitialPage(browser()->GetSelectedTabContents(),
                                true, GURL("http://interstitial.com"));
   interstitial_page->Show();
@@ skipping 74 matching lines @@
 IN_PROC_BROWSER_TEST_F(BrowserFocusTest, InterstitialFocus) {
   HTTPTestServer* server = StartHTTPServer();
 
   // First we navigate to our test page.
   GURL url = server->TestServerPageW(kSimplePage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   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(),
             focus_manager->GetFocusedView());
   EXPECT_TRUE(browser()->GetSelectedTabContents()->render_view_host()->view()->
       HasFocus());
 
   // Let's show an interstitial.erstitial
   TestInterstitialPage* interstitial_page =
       new TestInterstitialPage(browser()->GetSelectedTabContents(),
@@ skipping 24 matching lines @@
 IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FindFocusTest) {
   HTTPTestServer* server = StartHTTPServer();
 
   // Open some page (any page that doesn't steal focus).
   GURL url = server->TestServerPageW(kTypicalPage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   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.
   static const int VK_F = 0x46;
   ui_controls::SendKeyPressNotifyWhenDone(L'F', true, false, false,
                                           new MessageLoop::QuitTask());
   ui_test_utils::RunMessageLoop();
 
   // Ideally, we wouldn't sleep here and instead would intercept the
   // RenderViewHostDelegate::HandleKeyboardEvent() callback.  To do that, we
@@ skipping 51 matching lines @@
   EXPECT_EQ(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD, focused_view->GetID());
 }
 
 // Makes sure the focus is in the right location when opening the different
 // types of tabs.
 IN_PROC_BROWSER_TEST_F(BrowserFocusTest, TabInitialFocus) {
   HWND hwnd = reinterpret_cast<HWND>(browser()->window()->GetNativeHandle());
   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.
   browser()->ShowHistoryTab();
   EXPECT_EQ(browser_view->GetTabContentsContainerView(),
             focus_manager->GetFocusedView());
 
   // Open the new tab, focus should be on the location bar.
   browser()->NewTab();
   EXPECT_EQ(browser_view->GetLocationBarView(),
             focus_manager->GetFocusedView());
 
   // Open the download tab, focus should be on the tab contents.
   browser()->ShowDownloadsTab();
   EXPECT_EQ(browser_view->GetTabContentsContainerView(),
             focus_manager->GetFocusedView());
 
   // Open about:blank, focus should be on the location bar.
   browser()->AddTabWithURL(GURL("about:blank"), GURL(), PageTransition::LINK,
                            true, -1, false, NULL);
   EXPECT_EQ(browser_view->GetLocationBarView(),
             focus_manager->GetFocusedView());
 }