diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 21:28:21 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 21:28:21 +0000 |
| commit | d5c7934b36545f324df7d2f47527c41653b26771 (patch) | |
| tree | f4138557185bba59a73510d7c585807337f47cf2 /chrome | |
| parent | d1402b27dcac716aa511f05ef68da31a5c235b63 (diff) | |
| download | chromium_src-d5c7934b36545f324df7d2f47527c41653b26771.zip chromium_src-d5c7934b36545f324df7d2f47527c41653b26771.tar.gz chromium_src-d5c7934b36545f324df7d2f47527c41653b26771.tar.bz2 | |
Enables the new wrench menu by default on windows.
BUG=45734
TEST=make sure the new wrench menu works! Make sure and exer
Review URL: http://codereview.chromium.org/2845022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50893 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/views/browser_views_accessibility_browsertest.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/wrench_menu_model.cc | 4 | ||||
| -rw-r--r-- | chrome/test/interactive_ui/keyboard_access_uitest.cc | 7 |
3 files changed, 13 insertions, 2 deletions
diff --git a/chrome/browser/views/browser_views_accessibility_browsertest.cc b/chrome/browser/views/browser_views_accessibility_browsertest.cc index 7cfe44c..675a994 100644 --- a/chrome/browser/views/browser_views_accessibility_browsertest.cc +++ b/chrome/browser/views/browser_views_accessibility_browsertest.cc @@ -12,6 +12,7 @@ #include "chrome/browser/views/bookmark_bar_view.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/toolbar_view.h" +#include "chrome/browser/wrench_menu_model.h" #include "chrome/common/url_constants.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" @@ -224,6 +225,9 @@ IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, // Retrieve accessibility object for Page menu button and verify accessibility // info. IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, TestPageMenuAccObj) { + if (WrenchMenuModel::IsEnabled()) + return; // If the wrench menu is enabled there is no page menu. + // Verify Page menu button MSAA name and role. TestViewAccessibilityObject(GetToolbarView()->GetViewByID(VIEW_ID_PAGE_MENU), l10n_util::GetString(IDS_ACCNAME_PAGE), diff --git a/chrome/browser/wrench_menu_model.cc b/chrome/browser/wrench_menu_model.cc index 42bc6dc..d4c94f0 100644 --- a/chrome/browser/wrench_menu_model.cc +++ b/chrome/browser/wrench_menu_model.cc @@ -75,7 +75,11 @@ static bool CalculateEnabled() { std::string value = cl->GetSwitchValueASCII(switches::kNewWrenchMenu); return value.empty() || value == "true"; } +#if defined(TOOLKIT_VIEWS) + return true; +#else return false; +#endif } // static diff --git a/chrome/test/interactive_ui/keyboard_access_uitest.cc b/chrome/test/interactive_ui/keyboard_access_uitest.cc index bb8756a..be221f6 100644 --- a/chrome/test/interactive_ui/keyboard_access_uitest.cc +++ b/chrome/test/interactive_ui/keyboard_access_uitest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/keyboard_codes.h" +#include "chrome/browser/wrench_menu_model.h" #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/automation/window_proxy.h" @@ -69,8 +70,10 @@ void KeyboardAccessTest::TestMenuKeyboardAccess(bool alternate_key_sequence) { ASSERT_TRUE(browser->StartTrackingPopupMenus()); - // Press RIGHT to focus the app menu, then RETURN or DOWN to open it. - ASSERT_TRUE(window->SimulateOSKeyPress(base::VKEY_RIGHT, 0)); + if (!WrenchMenuModel::IsEnabled()) { + // Press RIGHT to focus the app menu, then RETURN or DOWN to open it. + ASSERT_TRUE(window->SimulateOSKeyPress(base::VKEY_RIGHT, 0)); + } if (alternate_key_sequence) ASSERT_TRUE(window->SimulateOSKeyPress(base::VKEY_DOWN, 0)); else |