diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-26 04:54:41 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-26 04:54:41 +0000 |
| commit | 65739d2375124a4715768118c082815b5483c87e (patch) | |
| tree | 482ef160fff151fb12708473ea4f5c9bc0762192 /ash | |
| parent | 712835ff6ac1b2195276df51c7b39d30d8bf7dd3 (diff) | |
| download | chromium_src-65739d2375124a4715768118c082815b5483c87e.zip chromium_src-65739d2375124a4715768118c082815b5483c87e.tar.gz chromium_src-65739d2375124a4715768118c082815b5483c87e.tar.bz2 | |
Remove the Exit menu item from the Wrench menu in Win/Ash.
BUG=176130
TEST=Metro/Ash chrome browsers lose their Exit menu item.
Review URL: https://chromiumcodereview.appspot.com/12330056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184588 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/accelerators/accelerator_controller_unittest.cc | 2 | ||||
| -rw-r--r-- | ash/accelerators/accelerator_table.cc | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc index 8ce8727..758ad18 100644 --- a/ash/accelerators/accelerator_controller_unittest.cc +++ b/ash/accelerators/accelerator_controller_unittest.cc @@ -856,9 +856,11 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) { #endif // OS_LINUX #endif // !NDEBUG +#if !defined(OS_WIN) // Exit EXPECT_TRUE(ProcessWithContext( ui::Accelerator(ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN))); +#endif // New tab EXPECT_TRUE(ProcessWithContext( diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc index 4ee3294..c08ff22 100644 --- a/ash/accelerators/accelerator_table.cc +++ b/ash/accelerators/accelerator_table.cc @@ -86,7 +86,9 @@ const AcceleratorData kAcceleratorData[] = { DISABLE_GPU_WATCHDOG }, #endif // defined(OS_CHROMEOS) { true, ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FEEDBACK_PAGE }, +#if !defined(OS_WIN) { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT }, +#endif { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, TOGGLE_SPOKEN_FEEDBACK }, { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |