Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2967)

Unified Diff: chrome/browser/browser_focus_uitest.cc

Issue 6246001: Move app/key* to ui/base/keycodes/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/automation/ui_controls_win.cc ('k') | chrome/browser/browser_keyevents_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_focus_uitest.cc
===================================================================
--- chrome/browser/browser_focus_uitest.cc (revision 71220)
+++ chrome/browser/browser_focus_uitest.cc (working copy)
@@ -313,7 +313,7 @@
ASSERT_TRUE(IsViewFocused(vid));
ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
- browser(), app::VKEY_TAB, true, false, false, false));
+ browser(), ui::VKEY_TAB, true, false, false, false));
}
// As above, but with ctrl+shift+tab.
@@ -324,7 +324,7 @@
ASSERT_TRUE(IsViewFocused(vid));
ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
- browser(), app::VKEY_TAB, true, true, false, false));
+ browser(), ui::VKEY_TAB, true, true, false, false));
}
}
}
@@ -485,7 +485,7 @@
Details<bool> details(&is_editable_node);
ASSERT_TRUE(ui_test_utils::SendKeyPressAndWaitWithDetails(
- browser(), app::VKEY_TAB, false, false, false, false,
+ browser(), ui::VKEY_TAB, false, false, false, false,
NotificationType::FOCUS_CHANGED_IN_PAGE,
NotificationSource(Source<RenderViewHost>(
browser()->GetSelectedTabContents()->render_view_host())),
@@ -493,7 +493,7 @@
} else {
// On the last tab key press, the focus returns to the browser.
ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
- browser(), app::VKEY_TAB, false, false, false, false,
+ browser(), ui::VKEY_TAB, false, false, false, false,
NotificationType::FOCUS_RETURNED_TO_BROWSER,
NotificationSource(Source<Browser>(browser()))));
}
@@ -524,7 +524,7 @@
Details<bool> details(&is_editable_node);
ASSERT_TRUE(ui_test_utils::SendKeyPressAndWaitWithDetails(
- browser(), app::VKEY_TAB, false, true, false, false,
+ browser(), ui::VKEY_TAB, false, true, false, false,
NotificationType::FOCUS_CHANGED_IN_PAGE,
NotificationSource(Source<RenderViewHost>(
browser()->GetSelectedTabContents()->render_view_host())),
@@ -532,7 +532,7 @@
} else {
// On the last tab key press, the focus returns to the browser.
ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
- browser(), app::VKEY_TAB, false, true, false, false,
+ browser(), ui::VKEY_TAB, false, true, false, false,
NotificationType::FOCUS_RETURNED_TO_BROWSER,
NotificationSource(Source<Browser>(browser()))));
}
@@ -615,7 +615,7 @@
}
ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
- browser(), app::VKEY_TAB, false, false, false, false,
+ browser(), ui::VKEY_TAB, false, false, false, false,
notification_type, notification_source));
}
@@ -646,7 +646,7 @@
}
ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
- browser(), app::VKEY_TAB, false, true, false, false,
+ browser(), ui::VKEY_TAB, false, true, false, false,
notification_type, notification_source));
// Let's make sure the focus is on the expected element in the page.
@@ -715,11 +715,11 @@
#if defined(OS_MACOSX)
// Press Cmd+F, which will make the Find box open and request focus.
ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
- browser(), app::VKEY_F, false, false, false, true));
+ browser(), ui::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(
- browser(), app::VKEY_F, true, false, false, false));
+ browser(), ui::VKEY_F, true, false, false, false));
#endif
// Ideally, we wouldn't sleep here and instead would intercept the
@@ -739,10 +739,10 @@
// Now press Ctrl+F again and focus should move to the Find box.
#if defined(OS_MACOSX)
ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
- browser(), app::VKEY_F, false, false, false, true));
+ browser(), ui::VKEY_F, false, false, false, true));
#else
ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
- browser(), app::VKEY_F, true, false, false, false));
+ browser(), ui::VKEY_F, true, false, false, false));
#endif
ASSERT_TRUE(IsViewFocused(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD));
@@ -753,10 +753,10 @@
// Now press Ctrl+F again and focus should move to the Find box.
#if defined(OS_MACOSX)
ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
- browser(), app::VKEY_F, false, false, false, true));
+ browser(), ui::VKEY_F, false, false, false, true));
#else
ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
- browser(), app::VKEY_F, true, false, false, false));
+ browser(), ui::VKEY_F, true, false, false, false));
#endif
// See remark above on why we wait.
« no previous file with comments | « chrome/browser/automation/ui_controls_win.cc ('k') | chrome/browser/browser_keyevents_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698