diff options
author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-05 20:43:41 +0000 |
---|---|---|
committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-05 20:43:41 +0000 |
commit | a9c060ca3ef4c5834955e94fe65bca94fb47c6a6 (patch) | |
tree | 4abc33f6679d789ff09a23dd92d564024b58874b /chrome/browser/ui/omnibox/omnibox_view_browsertest.cc | |
parent | 24845d70f3c481caa231cc24322927f636f3acd7 (diff) | |
download | chromium_src-a9c060ca3ef4c5834955e94fe65bca94fb47c6a6.zip chromium_src-a9c060ca3ef4c5834955e94fe65bca94fb47c6a6.tar.gz chromium_src-a9c060ca3ef4c5834955e94fe65bca94fb47c6a6.tar.bz2 |
AURA/X11: Handle VKEY_MENU accelerator on content area
-Moved the code to handle vkey_menu to focus manager.
-Unify the code between win/aura/gtk to handle unhandled web keyevent. We were using different code path for unhandled web keyboard for regular page and login. This should fix this issue also.
-Improved focus test not to use fixed wait. This should also speedup the test a bit.
-Removed OmniboxViewViews tests that runs only on views/gtk. This is no longer supported and we can re-enable for win when ready.
BUG=99861,106998, 108480, 108459
TEST=manual: set focus to content area and hit alt key. the focus should be set to wrench menu on release.
Review URL: http://codereview.chromium.org/8907029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116541 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/omnibox/omnibox_view_browsertest.cc')
-rw-r--r-- | chrome/browser/ui/omnibox/omnibox_view_browsertest.cc | 78 |
1 files changed, 1 insertions, 77 deletions
diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc index 336b218..1782625 100644 --- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc +++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -1334,79 +1334,3 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, FLAKY_PasteReplacingAll) { ASSERT_EQ(ASCIIToUTF16("abc"), omnibox_view->GetText()); } #endif - -// TODO(beng): enable on windows once it actually works. -// No need to run extra pure views tests on aura. -#if defined(TOOLKIT_VIEWS) && !defined(OS_WIN) && !defined(USE_AURA) -class OmniboxViewViewsTest : public OmniboxViewTest { - public: - OmniboxViewViewsTest() { - views::Widget::SetPureViews(true); - } -}; - -IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, - FLAKY_BrowserAccelerators) { - BrowserAcceleratorsTest(); -} - -IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, MAYBE_PopupAccelerators) { - PopupAcceleratorsTest(); -} - -IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, BackspaceInKeywordMode) { - BackspaceInKeywordModeTest(); -} - -IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, Escape) { - EscapeTest(); -} - -IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, DesiredTLD) { - DesiredTLDTest(); -} - -IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, AltEnter) { - AltEnterTest(); -} - -IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, EnterToSearch) { - EnterToSearchTest(); -} - -IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, EscapeToDefaultMatch) { - EscapeToDefaultMatchTest(); -} - -IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, BasicTextOperations) { - BasicTextOperationsTest(); -} - -IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, AcceptKeywordBySpace) { - AcceptKeywordBySpaceTest(); -} - -IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, - NonSubstitutingKeywordTest) { - NonSubstitutingKeywordTest(); -} - -IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, DeleteItem) { - DeleteItemTest(); -} - -IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, TabMoveCursorToEnd) { - TabMoveCursorToEndTest(); -} - -IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, - PersistKeywordModeOnTabSwitch) { - PersistKeywordModeOnTabSwitch(); -} - -IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, - CtrlKeyPressedWithInlineAutocompleteTest) { - CtrlKeyPressedWithInlineAutocompleteTest(); -} - -#endif |