diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-02 19:54:58 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-02 19:54:58 +0000 |
| commit | 0cc3dfe387313821853e658a6e2fb3b729eac9e5 (patch) | |
| tree | 6bdf4d23c62ae78cafc6e7c5a2599cce70dfef22 /chrome/browser/browser_focus_uitest.cc | |
| parent | 3c70591cc7d0d8cc162c10f7d3ac3b2ac15e4e69 (diff) | |
| download | chromium_src-0cc3dfe387313821853e658a6e2fb3b729eac9e5.zip chromium_src-0cc3dfe387313821853e658a6e2fb3b729eac9e5.tar.gz chromium_src-0cc3dfe387313821853e658a6e2fb3b729eac9e5.tar.bz2 | |
Revert 58388 - Revert 58215 - Revert 58186 - Move the keyboard files from base/ to app/.
Also moves the associated classes/enums from base:: to app::.
TEST=try bots compile
BUG=NONE
Review URL: http://codereview.chromium.org/3165064
TBR=bryeung@chromium.org
TBR=phajdan.jr@chromium.org
Review URL: http://codereview.chromium.org/3361003
TBR=bryeung@chromium.org
Review URL: http://codereview.chromium.org/3337006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58390 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_focus_uitest.cc')
| -rw-r--r-- | chrome/browser/browser_focus_uitest.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc index 0b7ffa7..12515f7 100644 --- a/chrome/browser/browser_focus_uitest.cc +++ b/chrome/browser/browser_focus_uitest.cc @@ -306,7 +306,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, TabsRememberFocus) { ASSERT_TRUE(IsViewFocused(vid)); ASSERT_TRUE(ui_test_utils::SendKeyPressSync( - window, app::VKEY_TAB, true, false, false, false)); + window, base::VKEY_TAB, true, false, false, false)); } // As above, but with ctrl+shift+tab. @@ -317,7 +317,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, TabsRememberFocus) { ASSERT_TRUE(IsViewFocused(vid)); ASSERT_TRUE(ui_test_utils::SendKeyPressSync( - window, app::VKEY_TAB, true, true, false, false)); + window, base::VKEY_TAB, true, true, false, false)); } } } @@ -480,7 +480,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversal) { &actual)); ASSERT_STREQ(kExpElementIDs[j], actual.c_str()); - ASSERT_TRUE(ui_controls::SendKeyPress(window, app::VKEY_TAB, + ASSERT_TRUE(ui_controls::SendKeyPress(window, base::VKEY_TAB, false, false, false, false)); if (j < arraysize(kExpElementIDs) - 1) { @@ -509,7 +509,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversal) { // Now let's press shift-tab to move the focus in reverse. for (size_t j = 0; j < 7; ++j) { SCOPED_TRACE(StringPrintf("inner loop: %" PRIuS, j)); - ASSERT_TRUE(ui_controls::SendKeyPress(window, app::VKEY_TAB, + ASSERT_TRUE(ui_controls::SendKeyPress(window, base::VKEY_TAB, false, true, false, false)); if (j < arraysize(kExpElementIDs) - 1) { @@ -584,7 +584,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversalOnInterstitial) { std::string actual = interstitial_page->GetFocusedElement(); ASSERT_STREQ(kExpElementIDs[j], actual.c_str()); - ASSERT_TRUE(ui_controls::SendKeyPress(window, app::VKEY_TAB, + ASSERT_TRUE(ui_controls::SendKeyPress(window, base::VKEY_TAB, false, false, false, false)); if (j < arraysize(kExpElementIDs) - 1) { @@ -609,7 +609,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversalOnInterstitial) { // Now let's press shift-tab to move the focus in reverse. for (size_t j = 0; j < 7; ++j) { - ASSERT_TRUE(ui_controls::SendKeyPress(window, app::VKEY_TAB, + ASSERT_TRUE(ui_controls::SendKeyPress(window, base::VKEY_TAB, false, true, false, false)); if (j < arraysize(kExpElementIDs) - 1) { @@ -682,11 +682,11 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FindFocusTest) { #if defined(OS_MACOSX) // Press Cmd+F, which will make the Find box open and request focus. ASSERT_TRUE(ui_test_utils::SendKeyPressSync( - window, app::VKEY_F, false, false, false, true)); + window, base::VKEY_F, false, false, false, true)); #else // Press Ctrl+F, which will make the Find box open and request focus. ASSERT_TRUE(ui_test_utils::SendKeyPressSync( - window, app::VKEY_F, true, false, false, false)); + window, base::VKEY_F, true, false, false, false)); #endif // Ideally, we wouldn't sleep here and instead would intercept the @@ -706,10 +706,10 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FindFocusTest) { // Now press Ctrl+F again and focus should move to the Find box. #if defined(OS_MACOSX) ASSERT_TRUE(ui_test_utils::SendKeyPressSync( - window, app::VKEY_F, false, false, false, true)); + window, base::VKEY_F, false, false, false, true)); #else ASSERT_TRUE(ui_test_utils::SendKeyPressSync( - window, app::VKEY_F, true, false, false, false)); + window, base::VKEY_F, true, false, false, false)); #endif ASSERT_TRUE(IsViewFocused(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD)); @@ -720,10 +720,10 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FindFocusTest) { // Now press Ctrl+F again and focus should move to the Find box. #if defined(OS_MACOSX) ASSERT_TRUE(ui_test_utils::SendKeyPressSync( - window, app::VKEY_F, false, false, false, true)); + window, base::VKEY_F, false, false, false, true)); #else ASSERT_TRUE(ui_test_utils::SendKeyPressSync( - window, app::VKEY_F, true, false, false, false)); + window, base::VKEY_F, true, false, false, false)); #endif // See remark above on why we wait. |