diff options
Diffstat (limited to 'chrome/browser/browser_focus_uitest.cc')
| -rw-r--r-- | chrome/browser/browser_focus_uitest.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc index 8aebfcf..3681c1b 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::GetFocusManagerForNativeView(hwnd); + views::FocusManager::GetFocusManager(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::GetFocusManagerForNativeView(hwnd2); + views::FocusManager::GetFocusManager(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::GetFocusManagerForNativeView(hwnd); + 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); + 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::GetFocusManagerForNativeView(hwnd); + views::FocusManager::GetFocusManager(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::GetFocusManagerForNativeView(hwnd); + views::FocusManager::GetFocusManager(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::GetFocusManagerForNativeView(hwnd); + views::FocusManager::GetFocusManager(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::GetFocusManagerForNativeView(hwnd); + views::FocusManager::GetFocusManager(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::GetFocusManagerForNativeView(hwnd); + views::FocusManager::GetFocusManager(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::GetFocusManagerForNativeView(hwnd); + views::FocusManager::GetFocusManager(hwnd); ASSERT_TRUE(focus_manager); // Open the history tab, focus should be on the tab contents. |