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 | |
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
-rw-r--r-- | chrome/browser/browser_keyevents_browsertest.cc | 5 | ||||
-rw-r--r-- | chrome/browser/ui/browser_focus_uitest.cc | 61 | ||||
-rw-r--r-- | chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.mm | 2 | ||||
-rw-r--r-- | chrome/browser/ui/cocoa/view_id_util_browsertest.mm | 1 | ||||
-rw-r--r-- | chrome/browser/ui/gtk/browser_toolbar_gtk.cc | 2 | ||||
-rw-r--r-- | chrome/browser/ui/gtk/view_id_util.cc | 3 | ||||
-rw-r--r-- | chrome/browser/ui/gtk/view_id_util_browsertest.cc | 1 | ||||
-rw-r--r-- | chrome/browser/ui/omnibox/action_box_browsertest.cc | 8 | ||||
-rw-r--r-- | chrome/browser/ui/omnibox/omnibox_view_browsertest.cc | 57 | ||||
-rw-r--r-- | chrome/browser/ui/view_ids.h | 1 | ||||
-rw-r--r-- | chrome/browser/ui/views/find_bar_host_interactive_uitest.cc | 33 | ||||
-rw-r--r-- | chrome/browser/ui/views/location_bar/location_bar_view.cc | 4 | ||||
-rw-r--r-- | chrome/browser/ui/views/toolbar_view_browsertest.cc | 2 |
13 files changed, 53 insertions, 127 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"")); diff --git a/chrome/browser/ui/browser_focus_uitest.cc b/chrome/browser/ui/browser_focus_uitest.cc index 0c053f9..3e0d748 100644 --- a/chrome/browser/ui/browser_focus_uitest.cc +++ b/chrome/browser/ui/browser_focus_uitest.cc @@ -39,13 +39,10 @@ #include "content/public/test/browser_test_utils.h" #include "net/test/test_server.h" -#if defined(TOOLKIT_VIEWS) || defined(OS_WIN) -#include "ui/views/focus/focus_manager.h" -#include "ui/views/view.h" -#endif - #if defined(TOOLKIT_VIEWS) #include "chrome/browser/ui/views/frame/browser_view.h" +#include "ui/views/focus/focus_manager.h" +#include "ui/views/view.h" #endif #if defined(OS_WIN) @@ -154,14 +151,6 @@ void CheckFocus(Browser* browser, ViewID id, const base::Time& timeout) { class BrowserFocusTest : public InProcessBrowserTest { public: - BrowserFocusTest() : -#if defined(USE_AURA) - location_bar_focus_view_id_(VIEW_ID_OMNIBOX) -#else - location_bar_focus_view_id_(VIEW_ID_LOCATION_BAR) -#endif - {} - bool IsViewFocused(ViewID vid) { return ui_test_utils::IsViewFocused(browser(), vid); } @@ -180,8 +169,6 @@ class BrowserFocusTest : public InProcessBrowserTest { content::RunMessageLoop(); return IsViewFocused(vid); } - - ViewID location_bar_focus_view_id_; }; class TestInterstitialPage : public content::InterstitialPageDelegate { @@ -238,13 +225,13 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_ClickingMovesFocus) { content::RunMessageLoop(); #endif // defined(OS_POSIX) - ASSERT_TRUE(IsViewFocused(location_bar_focus_view_id_)); + ASSERT_TRUE(IsViewFocused(VIEW_ID_OMNIBOX)); ClickOnView(VIEW_ID_TAB_CONTAINER); ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER)); - ClickOnView(VIEW_ID_LOCATION_BAR); - ASSERT_TRUE(IsViewFocused(location_bar_focus_view_id_)); + ClickOnView(VIEW_ID_OMNIBOX); + ASSERT_TRUE(IsViewFocused(VIEW_ID_OMNIBOX)); } // Flaky, http://crbug.com/69034. @@ -266,11 +253,11 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_BrowsersRememberFocus) { ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER)); chrome::FocusLocationBar(browser()); - ASSERT_TRUE(IsViewFocused(location_bar_focus_view_id_)); + ASSERT_TRUE(IsViewFocused(VIEW_ID_OMNIBOX)); // Hide the window, show it again, the focus should not have changed. ui_test_utils::HideNativeWindow(window); ASSERT_TRUE(ui_test_utils::ShowAndFocusNativeWindow(window)); - ASSERT_TRUE(IsViewFocused(location_bar_focus_view_id_)); + ASSERT_TRUE(IsViewFocused(VIEW_ID_OMNIBOX)); // The rest of this test does not make sense on Linux because the behavior // of Activate() is not well defined and can vary by window manager. @@ -299,7 +286,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_BrowsersRememberFocus) { // Switch to the 1st browser window, focus should still be on the location // bar and the second browser should have nothing focused. browser()->window()->Activate(); - ASSERT_TRUE(IsViewFocused(location_bar_focus_view_id_)); + ASSERT_TRUE(IsViewFocused(VIEW_ID_OMNIBOX)); EXPECT_EQ(NULL, focus_manager2->GetFocusedView()); // Switch back to the second browser, focus should still be on the page. @@ -356,8 +343,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_TabsRememberFocus) { // Activate the tab. browser()->tab_strip_model()->ActivateTabAt(j, true); - ViewID vid = kFocusPage[i][j] ? VIEW_ID_TAB_CONTAINER : - location_bar_focus_view_id_; + ViewID vid = kFocusPage[i][j] ? VIEW_ID_TAB_CONTAINER : VIEW_ID_OMNIBOX; ASSERT_TRUE(IsViewFocused(vid)); } @@ -366,7 +352,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_TabsRememberFocus) { // this has regressed in the past. Loop through several times to be sure. for (int j = 0; j < 15; j++) { ViewID vid = kFocusPage[i][j % 5] ? VIEW_ID_TAB_CONTAINER : - location_bar_focus_view_id_; + VIEW_ID_OMNIBOX; ASSERT_TRUE(IsViewFocused(vid)); ASSERT_TRUE(ui_test_utils::SendKeyPressSync( @@ -377,7 +363,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_TabsRememberFocus) { browser()->tab_strip_model()->ActivateTabAt(4, true); for (int j = 14; j >= 0; --j) { ViewID vid = kFocusPage[i][j % 5] ? VIEW_ID_TAB_CONTAINER : - location_bar_focus_view_id_; + VIEW_ID_OMNIBOX; ASSERT_TRUE(IsViewFocused(vid)); ASSERT_TRUE(ui_test_utils::SendKeyPressSync( @@ -413,7 +399,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_TabsRememberFocusFindInPage) { // Select 1st tab, focus should still be on the location-bar. // (bug http://crbug.com/23296) browser()->tab_strip_model()->ActivateTabAt(0, true); - ASSERT_TRUE(IsViewFocused(location_bar_focus_view_id_)); + ASSERT_TRUE(IsViewFocused(VIEW_ID_OMNIBOX)); // Now open the find box again, switch to another tab and come back, the focus // should return to the find box. @@ -493,7 +479,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, LocationBarLockFocus) { "stealFocus();")); // Make sure the location bar is still focused. - ASSERT_TRUE(IsViewFocused(location_bar_focus_view_id_)); + ASSERT_TRUE(IsViewFocused(VIEW_ID_OMNIBOX)); } // Focus traversal on a regular page. @@ -523,7 +509,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversal) { for (int i = 0; i < 3; ++i) { SCOPED_TRACE(base::StringPrintf("outer loop: %d", i)); // Location bar should be focused. - ASSERT_TRUE(IsViewFocused(location_bar_focus_view_id_)); + ASSERT_TRUE(IsViewFocused(VIEW_ID_OMNIBOX)); // Move the caret to the end, otherwise the next Tab key may not move focus. ASSERT_TRUE(ui_test_utils::SendKeyPressSync( @@ -573,7 +559,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversal) { for (int i = 0; i < 3; ++i) { SCOPED_TRACE(base::StringPrintf("outer loop: %d", i)); // Location bar should be focused. - ASSERT_TRUE(IsViewFocused(location_bar_focus_view_id_)); + ASSERT_TRUE(IsViewFocused(VIEW_ID_OMNIBOX)); // Move the caret to the end, otherwise the next Tab key may not move focus. ASSERT_TRUE(ui_test_utils::SendKeyPressSync( @@ -656,7 +642,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversalOnInterstitial) { // Test forward focus traversal. for (int i = 0; i < 2; ++i) { // Location bar should be focused. - ASSERT_TRUE(IsViewFocused(location_bar_focus_view_id_)); + ASSERT_TRUE(IsViewFocused(VIEW_ID_OMNIBOX)); // Move the caret to the end, otherwise the next Tab key may not move focus. ASSERT_TRUE(ui_test_utils::SendKeyPressSync( @@ -699,7 +685,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversalOnInterstitial) { // Now let's try reverse focus traversal. for (int i = 0; i < 2; ++i) { // Location bar should be focused. - ASSERT_TRUE(IsViewFocused(location_bar_focus_view_id_)); + ASSERT_TRUE(IsViewFocused(VIEW_ID_OMNIBOX)); // Move the caret to the end, otherwise the next Tab key may not move focus. ASSERT_TRUE(ui_test_utils::SendKeyPressSync( @@ -801,7 +787,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_FindFocusTest) { ASSERT_TRUE(WaitForFocusChange(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD)); chrome::FocusLocationBar(browser()); - ASSERT_TRUE(IsViewFocused(location_bar_focus_view_id_)); + ASSERT_TRUE(IsViewFocused(VIEW_ID_OMNIBOX)); // Now press Ctrl+F again and focus should move to the Find box. #if defined(OS_MACOSX) @@ -845,7 +831,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_TabInitialFocus) { chrome::NewTab(browser()); ASSERT_NO_FATAL_FAILURE(content::WaitForLoadStop( browser()->tab_strip_model()->GetActiveWebContents())); - EXPECT_TRUE(IsViewFocused(location_bar_focus_view_id_)); + EXPECT_TRUE(IsViewFocused(VIEW_ID_OMNIBOX)); // Open the download tab, focus should be on the tab contents. chrome::ShowDownloads(browser()); @@ -858,7 +844,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_TabInitialFocus) { content::PAGE_TRANSITION_LINK); ASSERT_NO_FATAL_FAILURE(content::WaitForLoadStop( browser()->tab_strip_model()->GetActiveWebContents())); - EXPECT_TRUE(IsViewFocused(location_bar_focus_view_id_)); + EXPECT_TRUE(IsViewFocused(VIEW_ID_OMNIBOX)); } // Tests that focus goes where expected when using reload. @@ -886,12 +872,12 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FocusOnReload) { observer.Wait(); } // Focus should stay on the location bar. - ASSERT_TRUE(IsViewFocused(location_bar_focus_view_id_)); + ASSERT_TRUE(IsViewFocused(VIEW_ID_OMNIBOX)); // Open a regular page, focus the location bar, reload. ui_test_utils::NavigateToURL(browser(), test_server()->GetURL(kSimplePage)); chrome::FocusLocationBar(browser()); - ASSERT_TRUE(IsViewFocused(location_bar_focus_view_id_)); + ASSERT_TRUE(IsViewFocused(VIEW_ID_OMNIBOX)); { content::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, @@ -963,8 +949,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, // Go back to the first tab. The focus should not be in the omnibox. chrome::SelectPreviousTab(browser()); EXPECT_EQ(0, browser()->tab_strip_model()->active_index()); - EXPECT_FALSE(ui_test_utils::IsViewFocused(browser(), - VIEW_ID_LOCATION_BAR)); + EXPECT_FALSE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); } } // namespace diff --git a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.mm b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.mm index 06860a2..74b8fdd 100644 --- a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.mm +++ b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.mm @@ -408,7 +408,7 @@ } - (ViewID)viewID { - return VIEW_ID_LOCATION_BAR; + return VIEW_ID_OMNIBOX; } @end diff --git a/chrome/browser/ui/cocoa/view_id_util_browsertest.mm b/chrome/browser/ui/cocoa/view_id_util_browsertest.mm index 910032e..4f4276c 100644 --- a/chrome/browser/ui/cocoa/view_id_util_browsertest.mm +++ b/chrome/browser/ui/cocoa/view_id_util_browsertest.mm @@ -70,7 +70,6 @@ class ViewIDTest : public InProcessBrowserTest { if (i == VIEW_ID_STAR_BUTTON || i == VIEW_ID_CONTENTS_SPLIT || i == VIEW_ID_FEEDBACK_BUTTON || - i == VIEW_ID_OMNIBOX || i == VIEW_ID_SCRIPT_BUBBLE) { continue; } diff --git a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc index 0a2d4d3..6f0d735 100644 --- a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc +++ b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc @@ -280,7 +280,7 @@ void BrowserToolbarGtk::SetViewIDs() { ViewIDUtil::SetID(forward_->widget(), VIEW_ID_FORWARD_BUTTON); ViewIDUtil::SetID(reload_->widget(), VIEW_ID_RELOAD_BUTTON); ViewIDUtil::SetID(home_->widget(), VIEW_ID_HOME_BUTTON); - ViewIDUtil::SetID(location_bar_->widget(), VIEW_ID_LOCATION_BAR); + ViewIDUtil::SetID(location_bar_->widget(), VIEW_ID_OMNIBOX); ViewIDUtil::SetID(wrench_menu_button_->widget(), VIEW_ID_APP_MENU); } diff --git a/chrome/browser/ui/gtk/view_id_util.cc b/chrome/browser/ui/gtk/view_id_util.cc index 1efaa91..3ca6527 100644 --- a/chrome/browser/ui/gtk/view_id_util.cc +++ b/chrome/browser/ui/gtk/view_id_util.cc @@ -80,9 +80,6 @@ const char* GetNameFromID(ViewID id) { case VIEW_ID_STAR_BUTTON: return "chrome-toolbar-star-button"; - case VIEW_ID_LOCATION_BAR: - return "chrome-location-bar"; - case VIEW_ID_ACTION_BOX_BUTTON: return "chrome-action-box-button"; diff --git a/chrome/browser/ui/gtk/view_id_util_browsertest.cc b/chrome/browser/ui/gtk/view_id_util_browsertest.cc index 074c335..95f0a42 100644 --- a/chrome/browser/ui/gtk/view_id_util_browsertest.cc +++ b/chrome/browser/ui/gtk/view_id_util_browsertest.cc @@ -44,7 +44,6 @@ IN_PROC_BROWSER_TEST_F(ViewIDTest, Basic) { i == VIEW_ID_BOOKMARK_BAR_ELEMENT || i == VIEW_ID_TAB || i == VIEW_ID_FEEDBACK_BUTTON || - i == VIEW_ID_OMNIBOX || i == VIEW_ID_SCRIPT_BUBBLE) { continue; } diff --git a/chrome/browser/ui/omnibox/action_box_browsertest.cc b/chrome/browser/ui/omnibox/action_box_browsertest.cc index aa3f3c4..9bbe16e 100644 --- a/chrome/browser/ui/omnibox/action_box_browsertest.cc +++ b/chrome/browser/ui/omnibox/action_box_browsertest.cc @@ -36,13 +36,7 @@ class ActionBoxTest : public InProcessBrowserTest, ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); ASSERT_NO_FATAL_FAILURE(SetupComponents()); chrome::FocusLocationBar(browser()); - // Use Textfield's view id on pure views. See crbug.com/71144. - ViewID location_bar_focus_view_id = VIEW_ID_LOCATION_BAR; -#if defined(USE_AURA) - location_bar_focus_view_id = VIEW_ID_OMNIBOX; -#endif - ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), - location_bar_focus_view_id)); + ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); } virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc index 1cb71e0..f731cde 100644 --- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc +++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc @@ -57,15 +57,11 @@ namespace { const char kSearchKeyword[] = "foo"; const char kSearchKeyword2[] = "footest.com"; -const wchar_t kSearchKeywordKeys[] = { - ui::VKEY_F, ui::VKEY_O, ui::VKEY_O, 0 -}; +const wchar_t kSearchKeywordKeys[] = { ui::VKEY_F, ui::VKEY_O, ui::VKEY_O, 0 }; const char kSearchURL[] = "http://www.foo.com/search?q={searchTerms}"; const char kSearchShortName[] = "foo"; const char kSearchText[] = "abc"; -const wchar_t kSearchTextKeys[] = { - ui::VKEY_A, ui::VKEY_B, ui::VKEY_C, 0 -}; +const wchar_t kSearchTextKeys[] = { ui::VKEY_A, ui::VKEY_B, ui::VKEY_C, 0 }; const char kSearchTextURL[] = "http://www.foo.com/search?q=abc"; const char kSearchSingleChar[] = "z"; const wchar_t kSearchSingleCharKeys[] = { ui::VKEY_Z, 0 }; @@ -74,9 +70,7 @@ const char kSearchSingleCharURL[] = "http://www.foo.com/search?q=z"; const char kHistoryPageURL[] = "chrome://history/#q=abc"; const char kDesiredTLDHostname[] = "www.bar.com"; -const wchar_t kDesiredTLDKeys[] = { - ui::VKEY_B, ui::VKEY_A, ui::VKEY_R, 0 -}; +const wchar_t kDesiredTLDKeys[] = { ui::VKEY_B, ui::VKEY_A, ui::VKEY_R, 0 }; const char kInlineAutocompleteText[] = "def"; const wchar_t kInlineAutocompleteTextKeys[] = { @@ -160,20 +154,11 @@ const int kCtrlOrCmdMask = ui::EF_CONTROL_DOWN; class OmniboxViewTest : public InProcessBrowserTest, public content::NotificationObserver { protected: - OmniboxViewTest() - : location_bar_focus_view_id_(VIEW_ID_LOCATION_BAR) { - } - virtual void SetUpOnMainThread() OVERRIDE { ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); ASSERT_NO_FATAL_FAILURE(SetupComponents()); chrome::FocusLocationBar(browser()); - // Use Textfield's view id on pure views. See crbug.com/71144. -#if defined(USE_AURA) - location_bar_focus_view_id_ = VIEW_ID_OMNIBOX; -#endif - ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), - location_bar_focus_view_id_)); + ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); } static void GetOmniboxViewForBrowser( @@ -1123,8 +1108,7 @@ class OmniboxViewTest : public InProcessBrowserTest, ASSERT_EQ(text, omnibox_view->GetText()); // The location bar should still have focus. - ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), - location_bar_focus_view_id_)); + ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); // Trigger keyword mode by tab. ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0)); @@ -1141,9 +1125,7 @@ class OmniboxViewTest : public InProcessBrowserTest, ASSERT_TRUE(omnibox_view->model()->is_keyword_hint()); ASSERT_EQ(text, omnibox_view->model()->keyword()); ASSERT_EQ(text, omnibox_view->GetText()); - - ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), - location_bar_focus_view_id_)); + ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); } void TabTraverseResultsTest() { @@ -1171,8 +1153,7 @@ class OmniboxViewTest : public InProcessBrowserTest, // Don't move past the end. ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0)); ASSERT_EQ(old_selected_line, popup_model->selected_line()); - ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), - location_bar_focus_view_id_)); + ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); // Move back up the results. for (; popup_model->selected_line() > 0U; @@ -1184,8 +1165,7 @@ class OmniboxViewTest : public InProcessBrowserTest, // Don't move past the beginning. ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, ui::EF_SHIFT_DOWN)); ASSERT_EQ(0U, popup_model->selected_line()); - ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), - location_bar_focus_view_id_)); + ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); const TestHistoryEntry kHistoryFoo = { "http://foo/", "Page foo", kSearchText, 1, 1, false @@ -1208,8 +1188,7 @@ class OmniboxViewTest : public InProcessBrowserTest, ASSERT_TRUE(omnibox_view->GetText().empty()); // The location bar should still have focus. - ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), - location_bar_focus_view_id_)); + ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); // Pressing tab again should move to the next result and clear keyword // mode. @@ -1219,16 +1198,14 @@ class OmniboxViewTest : public InProcessBrowserTest, ASSERT_NE(text, omnibox_view->model()->keyword()); // The location bar should still have focus. - ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), - location_bar_focus_view_id_)); + ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); // Moving back up should not show keyword mode. ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, ui::EF_SHIFT_DOWN)); ASSERT_TRUE(omnibox_view->model()->is_keyword_hint()); ASSERT_EQ(text, omnibox_view->model()->keyword()); - ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), - location_bar_focus_view_id_)); + ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); } void PersistKeywordModeOnTabSwitch() { @@ -1287,7 +1264,7 @@ class OmniboxViewTest : public InProcessBrowserTest, } const views::View* GetFocusView() const { - return GetBrowserView()->GetViewByID(location_bar_focus_view_id_); + return GetBrowserView()->GetViewByID(VIEW_ID_OMNIBOX); } // Move the mouse to the center of the browser window and left-click. @@ -1317,13 +1294,6 @@ class OmniboxViewTest : public InProcessBrowserTest, ASSERT_TRUE(ui_test_utils::SendMouseEventsSync(button, ui_controls::UP)); } #endif // defined(USE_AURA) - - ViewID location_bar_focus_view_id() const { - return location_bar_focus_view_id_; - } - - private: - ViewID location_bar_focus_view_id_; }; // Test if ctrl-* accelerators are workable in omnibox. @@ -1707,8 +1677,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, CopyURLToClipboard) { // Location bar must have focus to receive Ctrl-C. chrome::FocusLocationBar(browser()); - ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), - location_bar_focus_view_id())); + ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); // Select full URL and copy it to clipboard. General text and html should // be available. diff --git a/chrome/browser/ui/view_ids.h b/chrome/browser/ui/view_ids.h index b5237f4..35dda47 100644 --- a/chrome/browser/ui/view_ids.h +++ b/chrome/browser/ui/view_ids.h @@ -39,7 +39,6 @@ enum ViewID { VIEW_ID_RELOAD_BUTTON, VIEW_ID_HOME_BUTTON, VIEW_ID_STAR_BUTTON, - VIEW_ID_LOCATION_BAR, VIEW_ID_APP_MENU, VIEW_ID_BROWSER_ACTION_TOOLBAR, VIEW_ID_FEEDBACK_BUTTON, diff --git a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc b/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc index 5ccb7e69..b65a199 100644 --- a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc +++ b/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc @@ -43,13 +43,7 @@ void Checkpoint(const char* message, const base::TimeTicks& start_time) { class FindInPageTest : public InProcessBrowserTest { public: - FindInPageTest() : -#if defined(USE_AURA) - location_bar_focus_view_id_(VIEW_ID_OMNIBOX) -#else - location_bar_focus_view_id_(VIEW_ID_LOCATION_BAR) -#endif - { + FindInPageTest() { FindBarHost::disable_animations_during_testing_ = true; } @@ -65,8 +59,6 @@ class FindInPageTest : public InProcessBrowserTest { return find_bar->GetFindSelectedText(); } - ViewID location_bar_focus_view_id_; - private: DISALLOW_COPY_AND_ASSIGN(FindInPageTest); }; @@ -104,10 +96,9 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, MAYBE_CrashEscHandlers) { // Click on the location bar so that Find box loses focus. ASSERT_NO_FATAL_FAILURE(ui_test_utils::ClickOnView(browser(), - VIEW_ID_LOCATION_BAR)); + VIEW_ID_OMNIBOX)); // Check the location bar is focused. - EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), - location_bar_focus_view_id_)); + EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); // This used to crash until bug 1303709 was fixed. ASSERT_TRUE(ui_test_utils::SendKeyPressSync( @@ -129,8 +120,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, MAYBE_FocusRestore) { // Focus the location bar, open and close the find-in-page, focus should // return to the location bar. chrome::FocusLocationBar(browser()); - EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), - location_bar_focus_view_id_)); + EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); // Ensure the creation of the find bar controller. browser()->GetFindBarController()->Show(); EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), @@ -138,8 +128,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, MAYBE_FocusRestore) { browser()->GetFindBarController()->EndFindSession( FindBarController::kKeepSelectionOnPage, FindBarController::kKeepResultsInFindBox); - EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), - location_bar_focus_view_id_)); + EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); // Focus the location bar, find something on the page, close the find box, // focus should go to the page. @@ -159,16 +148,14 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, MAYBE_FocusRestore) { // the location bar (same as before, just checking that http://crbug.com/23599 // is fixed). chrome::FocusLocationBar(browser()); - EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), - location_bar_focus_view_id_)); + EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); browser()->GetFindBarController()->Show(); EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_FIND_IN_PAGE_TEXT_FIELD)); browser()->GetFindBarController()->EndFindSession( FindBarController::kKeepSelectionOnPage, FindBarController::kKeepResultsInFindBox); - EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), - location_bar_focus_view_id_)); + EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); } // Fails often on Win, CrOS. http://crbug.com/145476, http://crbug.com/128724 @@ -217,8 +204,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, MAYBE_FocusRestoreOnTabSwitch) { // Set focus away from the Find bar (to the Location bar). chrome::FocusLocationBar(browser()); - EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), - location_bar_focus_view_id_)); + EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); // Select tab A. Find bar should get focus. browser()->tab_strip_model()->ActivateTabAt(0, true); @@ -228,8 +214,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, MAYBE_FocusRestoreOnTabSwitch) { // Select tab B. Location bar should get focus. browser()->tab_strip_model()->ActivateTabAt(1, true); - EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), - location_bar_focus_view_id_)); + EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); } // Flaky on XP: http://crbug.com/152100 diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index 68306ee..a0fd70e 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -76,6 +76,7 @@ #include "ui/views/border.h" #include "ui/views/button_drag_utils.h" #include "ui/views/controls/label.h" +#include "ui/views/controls/textfield/textfield.h" #include "ui/views/layout/layout_constants.h" #include "ui/views/widget/widget.h" @@ -190,7 +191,8 @@ LocationBarView::LocationBarView(Browser* browser, show_focus_rect_(false), template_url_service_(NULL), animation_offset_(0) { - set_id(VIEW_ID_LOCATION_BAR); + if (!views::Textfield::IsViewsTextfieldEnabled()) + set_id(VIEW_ID_OMNIBOX); if (mode_ == NORMAL) { background_painter_.reset( diff --git a/chrome/browser/ui/views/toolbar_view_browsertest.cc b/chrome/browser/ui/views/toolbar_view_browsertest.cc index 72fba53..bcfdf27 100644 --- a/chrome/browser/ui/views/toolbar_view_browsertest.cc +++ b/chrome/browser/ui/views/toolbar_view_browsertest.cc @@ -57,7 +57,7 @@ void ToolbarViewTest::RunToolbarCycleFocusTest(Browser* browser) { found_reload = true; if (view->id() == VIEW_ID_APP_MENU) found_app_menu = true; - if (view->id() == VIEW_ID_LOCATION_BAR || view->id() == VIEW_ID_OMNIBOX) + if (view->id() == VIEW_ID_OMNIBOX) found_location_bar = true; if (ids.size() > 100) GTEST_FAIL() << "Tabbed 100 times, still haven't cycled back!"; |