diff options
| -rw-r--r-- | ash/accelerators/accelerator_controller_unittest.cc | 2 | ||||
| -rw-r--r-- | ash/accelerators/accelerator_table.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/browser_command_controller.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/ui/toolbar/wrench_menu_model.cc | 7 |
4 files changed, 15 insertions, 1 deletions
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc index 3732e2c..7ef53ff 100644 --- a/ash/accelerators/accelerator_controller_unittest.cc +++ b/ash/accelerators/accelerator_controller_unittest.cc @@ -858,9 +858,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 1ae8377..54e4c5b 100644 --- a/ash/accelerators/accelerator_table.cc +++ b/ash/accelerators/accelerator_table.cc @@ -87,7 +87,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, diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc index 3d8e7ca..87a53d3 100644 --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc @@ -823,7 +823,12 @@ void BrowserCommandController::InitCommandState() { command_updater_.UpdateCommandEnabled(IDC_CLOSE_TAB, true); command_updater_.UpdateCommandEnabled(IDC_DUPLICATE_TAB, true); command_updater_.UpdateCommandEnabled(IDC_RESTORE_TAB, false); +#if defined(OS_WIN) && defined(USE_ASH) + if (browser_->host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH) + command_updater_.UpdateCommandEnabled(IDC_EXIT, true); +#else command_updater_.UpdateCommandEnabled(IDC_EXIT, true); +#endif command_updater_.UpdateCommandEnabled(IDC_DEBUG_FRAME_TOGGLE, true); #if defined(OS_WIN) && defined(USE_ASH) && !defined(NDEBUG) if (base::win::GetVersion() < base::win::VERSION_WIN8 && diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc index 1e8a285..ab2bc1f 100644 --- a/chrome/browser/ui/toolbar/wrench_menu_model.cc +++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc @@ -620,7 +620,12 @@ void WrenchMenuModel::Build(bool is_new_menu, bool supports_new_separators) { tools_menu_model_.get()); } - if (browser_defaults::kShowExitMenuItem) { + bool show_exit_menu = browser_defaults::kShowExitMenuItem; +#if defined(OS_WIN) && defined(USE_AURA) + if (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) + show_exit_menu = false; +#endif + if (show_exit_menu) { AddSeparator(ui::NORMAL_SEPARATOR); AddItemWithStringId(IDC_EXIT, IDS_EXIT); } |