diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-12 17:57:11 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-12 17:57:11 +0000 |
| commit | 6ed406cd55f81e2dce4d81fa80f561582d8ab378 (patch) | |
| tree | cbdbb7cb0c123abc6fc274bba5f66bc60275008f /chrome/browser/ui/browser_command_controller.cc | |
| parent | 470020d2a3558be5acd4b74c29f0df38c9d9edd6 (diff) | |
| download | chromium_src-6ed406cd55f81e2dce4d81fa80f561582d8ab378.zip chromium_src-6ed406cd55f81e2dce4d81fa80f561582d8ab378.tar.gz chromium_src-6ed406cd55f81e2dce4d81fa80f561582d8ab378.tar.bz2 | |
Remove the Exit menu item from the Wrench menu in Win/Ash.
Relanding after a revert in crrev.com/184662 due to accidentally disabling the Exit menu on non Win-Ash platforms and then a subsequent revert in crrev.com/185061 since the second patch landed at an exciting time when tests were going berzerk and folk were reverting stuff like it was going out of style. Third time's the charm!
This patch is identical to patch set 4 in https://codereview.chromium.org/12330056/
BUG=176130
TEST=Metro/Ash chrome browsers lose their Exit menu item.
TBR=cpu, sky
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/12380027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187613 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_command_controller.cc')
| -rw-r--r-- | chrome/browser/ui/browser_command_controller.cc | 5 |
1 files changed, 5 insertions, 0 deletions
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 && |