Turn BrowserView::GetBrowserViewForNativeView() into GetBrowserViewForNativeW...

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 87 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_BrowsersRememberFocus) {
   HTTPTestServer* server = StartHTTPServer();
 
   // 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::GetBrowserViewForNativeView(hwnd);
+  BrowserView* browser_view = BrowserView::GetBrowserViewForNativeWindow(hwnd);
   ASSERT_TRUE(browser_view);
   views::FocusManager* focus_manager =
       views::FocusManager::GetFocusManager(hwnd);
   ASSERT_TRUE(focus_manager);
 
   EXPECT_EQ(browser_view->contents_container()->GetFocusView(),
             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
@@ skipping 19 matching lines @@
   EXPECT_EQ(location_bar, focus_manager->GetFocusedView());
 
   // Open a new browser window.
   Browser* browser2 = Browser::Create(browser()->profile());
   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::GetBrowserViewForNativeView(hwnd2);
+  BrowserView* browser_view2 =
+      BrowserView::GetBrowserViewForNativeWindow(hwnd2);
   ASSERT_TRUE(browser_view2);
   views::FocusManager* focus_manager2 =
       views::FocusManager::GetFocusManager(hwnd2);
   ASSERT_TRUE(focus_manager2);
   EXPECT_EQ(browser_view2->contents_container()->GetFocusView(),
             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();
@@ skipping 12 matching lines @@
 
 // Tabs remember focus.
 IN_PROC_BROWSER_TEST_F(BrowserFocusTest, TabsRememberFocus) {
   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::GetBrowserViewForNativeView(hwnd);
+  BrowserView* browser_view = BrowserView::GetBrowserViewForNativeWindow(hwnd);
   ASSERT_TRUE(browser_view);
 
   views::FocusManager* focus_manager =
       views::FocusManager::GetFocusManager(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);
@@ skipping 55 matching lines @@
   ui_test_utils::NavigateToURL(browser2, steal_focus_url);
 
   // Activate the first browser.
   browser()->window()->Activate();
 
   // Wait for the focus to be stolen by the other browser.
   ::Sleep(2000);
 
   // Make sure the first browser is still active.
   HWND hwnd = reinterpret_cast<HWND>(browser()->window()->GetNativeHandle());
-  BrowserView* browser_view = BrowserView::GetBrowserViewForNativeView(hwnd);
+  BrowserView* browser_view = BrowserView::GetBrowserViewForNativeWindow(hwnd);
   ASSERT_TRUE(browser_view);
   EXPECT_TRUE(browser_view->frame()->GetWindow()->IsActive());
 
   // Close the 2nd browser to avoid a DCHECK().
   HWND hwnd2 = reinterpret_cast<HWND>(browser2->window()->GetNativeHandle());
-  BrowserView* browser_view2 = BrowserView::GetBrowserViewForNativeView(hwnd2);
+  BrowserView* browser_view2 =
+      BrowserView::GetBrowserViewForNativeWindow(hwnd2);
   browser_view2->Close();
 }
 
 // Page cannot steal focus when focus is on location bar.
 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::GetBrowserViewForNativeView(hwnd);
+  BrowserView* browser_view = BrowserView::GetBrowserViewForNativeWindow(hwnd);
   views::FocusManager* focus_manager =
       views::FocusManager::GetFocusManager(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::GetBrowserViewForNativeView(hwnd);
+  BrowserView* browser_view = BrowserView::GetBrowserViewForNativeWindow(hwnd);
   views::FocusManager* focus_manager =
       views::FocusManager::GetFocusManager(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();
@@ skipping 69 matching lines @@
 
 // Focus traversal while an interstitial is showing.
 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::GetBrowserViewForNativeView(hwnd);
+  BrowserView* browser_view = BrowserView::GetBrowserViewForNativeWindow(hwnd);
   views::FocusManager* focus_manager =
       views::FocusManager::GetFocusManager(hwnd);
 
   // Focus should be on the page.
   EXPECT_EQ(browser_view->contents_container()->GetFocusView(),
             focus_manager->GetFocusedView());
 
   // Let's show an interstitial.
   TestInterstitialPage* interstitial_page =
       new TestInterstitialPage(browser()->GetSelectedTabContents(),
@@ skipping 74 matching lines @@
 
 // Focus stays on page with interstitials.
 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::GetBrowserViewForNativeView(hwnd);
+  BrowserView* browser_view = BrowserView::GetBrowserViewForNativeWindow(hwnd);
   views::FocusManager* focus_manager =
       views::FocusManager::GetFocusManager(hwnd);
 
   // Page should have focus.
   EXPECT_EQ(browser_view->contents_container()->GetFocusView(),
             focus_manager->GetFocusedView());
   EXPECT_TRUE(browser()->GetSelectedTabContents()->render_view_host()->view()->
       HasFocus());
 
   // Let's show an interstitial.
@@ skipping 24 matching lines @@
 
 // Make sure Find box can request focus, even when it is already open.
 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::GetBrowserViewForNativeView(hwnd);
+  BrowserView* browser_view = BrowserView::GetBrowserViewForNativeWindow(hwnd);
   views::FocusManager* focus_manager =
       views::FocusManager::GetFocusManager(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();
 
@@ skipping 50 matching lines @@
 
   focused_view = focus_manager->GetFocusedView();
   ASSERT_TRUE(focused_view != NULL);
   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::GetBrowserViewForNativeView(hwnd);
+  BrowserView* browser_view = BrowserView::GetBrowserViewForNativeWindow(hwnd);
   ASSERT_TRUE(browser_view);
   views::FocusManager* focus_manager =
       views::FocusManager::GetFocusManager(hwnd);
   ASSERT_TRUE(focus_manager);
 
   // Open the history tab, focus should be on the tab contents.
   browser()->ShowHistoryTab();
   EXPECT_EQ(browser_view->contents_container()->GetFocusView(),
             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->contents_container()->GetFocusView(),
             focus_manager->GetFocusedView());
 }