diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-03 00:09:18 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-03 00:09:18 +0000 |
| commit | 5c4e44804d85225822da5f5e4c68b90feaaa61d5 (patch) | |
| tree | ebd3232fdff836ee1c77dfd2d35f9345ce3f08d2 /chrome/browser/browser_keyevents_browsertest.cc | |
| parent | df390440f8131752a02aeb8c9168980b2ae19d1b (diff) | |
| download | chromium_src-5c4e44804d85225822da5f5e4c68b90feaaa61d5.zip chromium_src-5c4e44804d85225822da5f5e4c68b90feaaa61d5.tar.gz chromium_src-5c4e44804d85225822da5f5e4c68b90feaaa61d5.tar.bz2 | |
Consolidate VIEW_ID_LOCATION_BAR into VIEW_ID_OMNIBOX.
VIEW_ID_OMNIBOX and VIEW_ID_LOCATION_BAR are redundant.
Many tests needlessly exchange the IDs based on USE_AURA.
Merge the two IDs as VIEW_ID_OMNIBOX and update tests.
BUG=131660
TEST=No observable behavior changes; tests still pass.
R=sail@chromium.org,pkasting@chromium.org
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/12377065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185787 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_keyevents_browsertest.cc')
| -rw-r--r-- | chrome/browser/browser_keyevents_browsertest.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc index 6704bc1..5dd8c04 100644 --- a/chrome/browser/browser_keyevents_browsertest.cc +++ b/chrome/browser/browser_keyevents_browsertest.cc @@ -27,6 +27,7 @@ #include "content/public/test/browser_test_utils.h" #include "net/test/test_server.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/views/controls/textfield/textfield.h" using content::DomOperationNotificationDetails; using content::NavigationController; @@ -638,11 +639,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_AccessKeys) { // TODO(isherman): This is an experimental change to help diagnose // http://crbug.com/55713 content::RunAllPendingInMessageLoop(); -#if defined(USE_AURA) EXPECT_TRUE(IsViewFocused(VIEW_ID_OMNIBOX)); -#else - EXPECT_TRUE(IsViewFocused(VIEW_ID_LOCATION_BAR)); -#endif // No element should be focused, as Alt+D was handled by the browser. EXPECT_NO_FATAL_FAILURE(CheckFocusedElement(tab_index, L"")); |