summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_focus_uitest.cc
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-26 19:06:50 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-26 19:06:50 +0000
commit6eb7e132a6222068366e50a95a62281ebcbcfeb2 (patch)
treec1150002f4932f279d8d934de598b7f546ec52cc /chrome/browser/browser_focus_uitest.cc
parent4978bacf0e1b64f470eaaf828702bdbd84859d9f (diff)
downloadchromium_src-6eb7e132a6222068366e50a95a62281ebcbcfeb2.zip
chromium_src-6eb7e132a6222068366e50a95a62281ebcbcfeb2.tar.gz
chromium_src-6eb7e132a6222068366e50a95a62281ebcbcfeb2.tar.bz2
Renames BrowserView::GetBrowserViewForHWND to
GetBrowserViewForNativeView and implements the GTK side. I could have went with NativeWindow here, but we end up with more flexibility if we keep this as NativeView. BUG=none TEST=none Review URL: http://codereview.chromium.org/113842 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16882 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_focus_uitest.cc')
-rw-r--r--chrome/browser/browser_focus_uitest.cc22
1 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc
index 17946e0..a452e5f 100644
--- a/chrome/browser/browser_focus_uitest.cc
+++ b/chrome/browser/browser_focus_uitest.cc
@@ -105,7 +105,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_BrowsersRememberFocus) {
// The focus should be on the Tab contents.
HWND hwnd = reinterpret_cast<HWND>(browser()->window()->GetNativeHandle());
- BrowserView* browser_view = BrowserView::GetBrowserViewForHWND(hwnd);
+ BrowserView* browser_view = BrowserView::GetBrowserViewForNativeView(hwnd);
ASSERT_TRUE(browser_view);
views::FocusManager* focus_manager =
views::FocusManager::GetFocusManager(hwnd);
@@ -145,7 +145,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_BrowsersRememberFocus) {
ui_test_utils::NavigateToURL(browser2, url);
HWND hwnd2 = reinterpret_cast<HWND>(browser2->window()->GetNativeHandle());
- BrowserView* browser_view2 = BrowserView::GetBrowserViewForHWND(hwnd2);
+ BrowserView* browser_view2 = BrowserView::GetBrowserViewForNativeView(hwnd2);
ASSERT_TRUE(browser_view2);
views::FocusManager* focus_manager2 =
views::FocusManager::GetFocusManager(hwnd2);
@@ -178,7 +178,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, TabsRememberFocus) {
ui_test_utils::NavigateToURL(browser(), url);
HWND hwnd = reinterpret_cast<HWND>(browser()->window()->GetNativeHandle());
- BrowserView* browser_view = BrowserView::GetBrowserViewForHWND(hwnd);
+ BrowserView* browser_view = BrowserView::GetBrowserViewForNativeView(hwnd);
ASSERT_TRUE(browser_view);
views::FocusManager* focus_manager =
@@ -254,13 +254,13 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, BackgroundBrowserDontStealFocus) {
// Make sure the first browser is still active.
HWND hwnd = reinterpret_cast<HWND>(browser()->window()->GetNativeHandle());
- BrowserView* browser_view = BrowserView::GetBrowserViewForHWND(hwnd);
+ BrowserView* browser_view = BrowserView::GetBrowserViewForNativeView(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::GetBrowserViewForHWND(hwnd2);
+ BrowserView* browser_view2 = BrowserView::GetBrowserViewForNativeView(hwnd2);
browser_view2->Close();
}
@@ -273,7 +273,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, LocationBarLockFocus) {
ui_test_utils::NavigateToURL(browser(), url);
HWND hwnd = reinterpret_cast<HWND>(browser()->window()->GetNativeHandle());
- BrowserView* browser_view = BrowserView::GetBrowserViewForHWND(hwnd);
+ BrowserView* browser_view = BrowserView::GetBrowserViewForNativeView(hwnd);
views::FocusManager* focus_manager =
views::FocusManager::GetFocusManager(hwnd);
@@ -301,7 +301,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FocusTraversal) {
ui_test_utils::NavigateToURL(browser(), url);
HWND hwnd = reinterpret_cast<HWND>(browser()->window()->GetNativeHandle());
- BrowserView* browser_view = BrowserView::GetBrowserViewForHWND(hwnd);
+ BrowserView* browser_view = BrowserView::GetBrowserViewForNativeView(hwnd);
views::FocusManager* focus_manager =
views::FocusManager::GetFocusManager(hwnd);
@@ -391,7 +391,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FocusTraversalOnInterstitial) {
ui_test_utils::NavigateToURL(browser(), url);
HWND hwnd = reinterpret_cast<HWND>(browser()->window()->GetNativeHandle());
- BrowserView* browser_view = BrowserView::GetBrowserViewForHWND(hwnd);
+ BrowserView* browser_view = BrowserView::GetBrowserViewForNativeView(hwnd);
views::FocusManager* focus_manager =
views::FocusManager::GetFocusManager(hwnd);
@@ -486,7 +486,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, InterstitialFocus) {
ui_test_utils::NavigateToURL(browser(), url);
HWND hwnd = reinterpret_cast<HWND>(browser()->window()->GetNativeHandle());
- BrowserView* browser_view = BrowserView::GetBrowserViewForHWND(hwnd);
+ BrowserView* browser_view = BrowserView::GetBrowserViewForNativeView(hwnd);
views::FocusManager* focus_manager =
views::FocusManager::GetFocusManager(hwnd);
@@ -531,7 +531,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FindFocusTest) {
ui_test_utils::NavigateToURL(browser(), url);
HWND hwnd = reinterpret_cast<HWND>(browser()->window()->GetNativeHandle());
- BrowserView* browser_view = BrowserView::GetBrowserViewForHWND(hwnd);
+ BrowserView* browser_view = BrowserView::GetBrowserViewForNativeView(hwnd);
views::FocusManager* focus_manager =
views::FocusManager::GetFocusManager(hwnd);
LocationBarView* location_bar = browser_view->GetLocationBarView();
@@ -602,7 +602,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FindFocusTest) {
// types of tabs.
IN_PROC_BROWSER_TEST_F(BrowserFocusTest, TabInitialFocus) {
HWND hwnd = reinterpret_cast<HWND>(browser()->window()->GetNativeHandle());
- BrowserView* browser_view = BrowserView::GetBrowserViewForHWND(hwnd);
+ BrowserView* browser_view = BrowserView::GetBrowserViewForNativeView(hwnd);
ASSERT_TRUE(browser_view);
views::FocusManager* focus_manager =
views::FocusManager::GetFocusManager(hwnd);