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

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);

chrome/browser/ui/toolbar/wrench_menu_model.cc

@@ -464,7 +464,7 @@ void WrenchMenuModel::Build(bool is_new_menu, bool supports_new_separators) {
     AddItemWithStringId(IDC_NEW_WINDOW, IDS_NEW_WINDOW);
     AddItemWithStringId(IDC_NEW_INCOGNITO_WINDOW, IDS_NEW_INCOGNITO_WINDOW);
   }
-#if defined(USE_ASH)
+#if !defined(NDEBUG) && defined(USE_ASH)
   if (base::win::GetVersion() < base::win::VERSION_WIN8 &&
       chrome::HOST_DESKTOP_TYPE_NATIVE != chrome::HOST_DESKTOP_TYPE_ASH) {
     AddItemWithStringId(IDC_TOGGLE_ASH_DESKTOP,

chrome/browser/ui/views/frame/browser_view.cc

@@ -2354,15 +2354,6 @@ void BrowserView::LoadAccelerators() {
         accelerator, ui::AcceleratorManager::kNormalPriority, this);
   }
 #endif
-#if defined(OS_WIN) && defined(USE_AURA)
-    if (base::win::GetVersion() < base::win::VERSION_WIN8) {
-      ui::Accelerator accelerator(ui::VKEY_A,
-                                  ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN);
-      accelerator_table_[accelerator] = IDC_TOGGLE_ASH_DESKTOP;
-      focus_manager->RegisterAccelerator(
-          accelerator, ui::AcceleratorManager::kNormalPriority, this);
-    }
-#endif
 }
 
 int BrowserView::GetCommandIDForAppCommandID(int app_command_id) const {