summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/browser_command_controller.cc
diff options
context:
space:
mode:
authorcpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-14 01:06:08 +0000
committercpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-14 01:06:08 +0000
commit30e2210191f2b794fcadcb4329383c354d988f40 (patch)
tree747351a6bb4dcca34e29d0952a3c39a196ecf98c /chrome/browser/ui/browser_command_controller.cc
parentd8a95de49ff7961d6256b2f1dc5d7121ee6f59c7 (diff)
downloadchromium_src-30e2210191f2b794fcadcb4329383c354d988f40.zip
chromium_src-30e2210191f2b794fcadcb4329383c354d988f40.tar.gz
chromium_src-30e2210191f2b794fcadcb4329383c354d988f40.tar.bz2
Removing the menu entry to start the ash desktop in Windows.
Previouly we removed it from Win8 but it is really just something that is experimental and now that Aura is deployed we don't want the casual user to play with it. Accelerator entry is gone as well. The menu entry is kept in debug mode BUG=175036 TEST=menu entry is gone in canary, see bug Review URL: https://codereview.chromium.org/12251009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_command_controller.cc')
-rw-r--r--chrome/browser/ui/browser_command_controller.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
index 2b879c0..811679a 100644
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -811,7 +811,7 @@ void BrowserCommandController::InitCommandState() {
command_updater_.UpdateCommandEnabled(IDC_RESTORE_TAB, false);
command_updater_.UpdateCommandEnabled(IDC_EXIT, true);
command_updater_.UpdateCommandEnabled(IDC_DEBUG_FRAME_TOGGLE, true);
-#if defined(OS_WIN) && defined(USE_ASH)
+#if defined(OS_WIN) && defined(USE_ASH) && !defined(NDEBUG)
if (base::win::GetVersion() < base::win::VERSION_WIN8 &&
chrome::HOST_DESKTOP_TYPE_NATIVE != chrome::HOST_DESKTOP_TYPE_ASH)
command_updater_.UpdateCommandEnabled(IDC_TOGGLE_ASH_DESKTOP, true);