summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete
diff options
context:
space:
mode:
authorisherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-30 12:12:03 +0000
committerisherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-30 12:12:03 +0000
commitd1cd0715ae8b15982b7ca46f4497eeddb4b73bca (patch)
treee291ea82f2646cbb34797e76dfacbd19a472f4cf /chrome/browser/autocomplete
parent2e0af760bc26f010ea25c6304c5fb8e3ef4720c1 (diff)
downloadchromium_src-d1cd0715ae8b15982b7ca46f4497eeddb4b73bca.zip
chromium_src-d1cd0715ae8b15982b7ca46f4497eeddb4b73bca.tar.gz
chromium_src-d1cd0715ae8b15982b7ca46f4497eeddb4b73bca.tar.bz2
Don't try to test alt-f4 on ChromeOS.
BUG=none TEST=greener tree TBR=sky Review URL: http://codereview.chromium.org/3608001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61059 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc b/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc
index 9e7b05f..78059ae 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc
@@ -322,10 +322,12 @@ IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, BrowserAccelerators) {
ASSERT_NO_FATAL_FAILURE(SendKey(app::VKEY_X, true, false, false));
EXPECT_EQ(L"Hello ", edit_view->GetText());
+#if !defined(OS_CHROMEOS)
// Try alt-f4 to close the browser.
ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
browser(), app::VKEY_F4, false, false, true, false,
NotificationType::BROWSER_CLOSED, Source<Browser>(browser())));
+#endif
}
IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, PopupAccelerators) {
@@ -367,10 +369,12 @@ IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, PopupAccelerators) {
false));
EXPECT_EQ(L"Hello world", edit_view->GetText());
+#if !defined(OS_CHROMEOS)
// Try alt-f4 to close the popup.
ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
popup, app::VKEY_F4, false, false, true, false,
NotificationType::BROWSER_CLOSED, Source<Browser>(popup)));
+#endif
}
IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, BackspaceInKeywordMode) {