Turn BrowserView::GetBrowserViewForNativeView() into GetBrowserViewForNativeWindow()
This simplifies things on linux where the native window is not the same type
as the native view.
Review URL: http://codereview.chromium.org/115830
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17043 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc
index a452e5fe..712f955 100644
--- a/chrome/browser/browser_focus_uitest.cc
+++ b/chrome/browser/browser_focus_uitest.cc
@@ -105,7 +105,7 @@
// 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);
@@ -145,7 +145,8 @@
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);
@@ -178,7 +179,7 @@
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 =
@@ -254,13 +255,14 @@
// 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();
}
@@ -273,7 +275,7 @@
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);
@@ -301,7 +303,7 @@
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);
@@ -391,7 +393,7 @@
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);
@@ -486,7 +488,7 @@
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);
@@ -531,7 +533,7 @@
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();
@@ -602,7 +604,7 @@
// 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);
