summaryrefslogtreecommitdiffstats
path: root/chrome/browser/instant
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-13 17:36:09 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-13 17:36:09 +0000
commitb6d81261a469240e25b41e7125bb7166ca3d35bb (patch)
tree9ddaf52100915560ce5c3d0167e79ef4a26aec56 /chrome/browser/instant
parent917a44b0724089630cb1d962a9383df7a1deaf7e (diff)
downloadchromium_src-b6d81261a469240e25b41e7125bb7166ca3d35bb.zip
chromium_src-b6d81261a469240e25b41e7125bb7166ca3d35bb.tar.gz
chromium_src-b6d81261a469240e25b41e7125bb7166ca3d35bb.tar.bz2
Move app/key* to ui/base/keycodes/*
BUG=none TEST=none TBR=brettw Review URL: http://codereview.chromium.org/6246001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71330 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/instant')
-rw-r--r--chrome/browser/instant/instant_browsertest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/instant/instant_browsertest.cc b/chrome/browser/instant/instant_browsertest.cc
index 6eaca52..816b4a3 100644
--- a/chrome/browser/instant/instant_browsertest.cc
+++ b/chrome/browser/instant/instant_browsertest.cc
@@ -111,7 +111,7 @@ class InstantTest : public InProcessBrowserTest {
NotificationType::INSTANT_CONTROLLER_SHOWN);
}
- void SendKey(app::KeyboardCode key) {
+ void SendKey(ui::KeyboardCode key) {
ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
browser(), key, false, false, false, false));
}
@@ -480,7 +480,7 @@ IN_PROC_BROWSER_TEST_F(InstantTest, OnSubmitEvent) {
ASSERT_NO_FATAL_FAILURE(SetupPreview());
ASSERT_NO_FATAL_FAILURE(SetLocationBarText(L"abc"));
- ASSERT_NO_FATAL_FAILURE(SendKey(app::VKEY_RETURN));
+ ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_RETURN));
// Check that the preview contents have been committed.
ASSERT_FALSE(browser()->instant()->GetPreviewContents());
@@ -534,7 +534,7 @@ IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE_TabKey) {
ASSERT_NO_FATAL_FAILURE(SetLocationBarText(L"abc"));
// Pressing tab to convert instant suggest into inline autocomplete.
- ASSERT_NO_FATAL_FAILURE(SendKey(app::VKEY_TAB));
+ ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB));
ASSERT_EQ(L"abcdef", location_bar_->location_entry()->GetText());
@@ -542,7 +542,7 @@ IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE_TabKey) {
GetSearchStateAsString(preview_));
// Pressing tab again to accept the current instant preview.
- ASSERT_NO_FATAL_FAILURE(SendKey(app::VKEY_TAB));
+ ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB));
// Check that the preview contents have been committed.
ASSERT_FALSE(browser()->instant()->GetPreviewContents());