Remove Metro pinning, and relaunch menu items and strings

chrome/browser/ui/toolbar/app_menu_model.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/toolbar/app_menu_model.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/command_line.h"
@@ skipping 88 matching lines @@
 // state.
 base::string16 GetUpgradeDialogMenuItemName() {
   if (UpgradeDetector::GetInstance()->is_outdated_install() ||
       UpgradeDetector::GetInstance()->is_outdated_install_no_au()) {
     return l10n_util::GetStringUTF16(IDS_UPGRADE_BUBBLE_MENU_ITEM);
   } else {
     return l10n_util::GetStringUTF16(IDS_UPDATE_NOW);
   }
 }
 
-#if defined(OS_WIN)
-bool GetRestartMenuItemIfRequired(const chrome::HostDesktopType& desktop_type,
-                                  int* command_id,
-                                  int* string_id) {
-  if (base::win::GetVersion() == base::win::VERSION_WIN8 ||
-      base::win::GetVersion() == base::win::VERSION_WIN8_1) {
-    if (desktop_type != chrome::HOST_DESKTOP_TYPE_ASH) {
-      *command_id = IDC_WIN8_METRO_RESTART;
-      *string_id = IDS_WIN8_METRO_RESTART;
-    } else {
-      *command_id = IDC_WIN_DESKTOP_RESTART;
-      *string_id = IDS_WIN_DESKTOP_RESTART;
-    }
-    return true;
-  }
-
-  // Windows 7 ASH mode is only supported in DEBUG for now.
-#if !defined(NDEBUG)
-  // Windows 8 can support ASH mode using WARP, but Windows 7 requires a working
-  // GPU compositor.
-  if (base::win::GetVersion() == base::win::VERSION_WIN7 &&
-      content::GpuDataManager::GetInstance()->CanUseGpuBrowserCompositor()) {
-    if (desktop_type != chrome::HOST_DESKTOP_TYPE_ASH) {
-      *command_id = IDC_WIN_CHROMEOS_RESTART;
-      *string_id = IDS_WIN_CHROMEOS_RESTART;
-    } else {
-      *command_id = IDC_WIN_DESKTOP_RESTART;
-      *string_id = IDS_WIN_DESKTOP_RESTART;
-    }
-    return true;
-  }
-#endif
-  return false;
-}
-#endif
-
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // EncodingMenuModel
 
 EncodingMenuModel::EncodingMenuModel(Browser* browser)
     : ui::SimpleMenuModel(this),
       browser_(browser) {
   Build();
 }
@@ skipping 334 matching lines @@
       LogMenuAction(MENU_ACTION_PIN_TO_START_SCREEN);
       break;
 
     // Recent tabs menu.
     case IDC_RESTORE_TAB:
       if (!uma_action_recorded_)
         UMA_HISTOGRAM_MEDIUM_TIMES("WrenchMenu.TimeToAction.RestoreTab", delta);
       LogMenuAction(MENU_ACTION_RESTORE_TAB);
       break;
 
-    // Windows.
-    case IDC_WIN_DESKTOP_RESTART:
-      if (!uma_action_recorded_) {
-        UMA_HISTOGRAM_MEDIUM_TIMES("WrenchMenu.TimeToAction.WinDesktopRestart",
-                                   delta);
-      }
-      LogMenuAction(MENU_ACTION_WIN_DESKTOP_RESTART);
-      break;
-    case IDC_WIN8_METRO_RESTART:
-      if (!uma_action_recorded_) {
-        UMA_HISTOGRAM_MEDIUM_TIMES("WrenchMenu.TimeToAction.Win8MetroRestart",
-                                   delta);
-      }
-      LogMenuAction(MENU_ACTION_WIN8_METRO_RESTART);
-      break;
-
-    case IDC_WIN_CHROMEOS_RESTART:
-      if (!uma_action_recorded_) {
-        UMA_HISTOGRAM_MEDIUM_TIMES("WrenchMenu.TimeToAction.ChromeOSRestart",
-                                   delta);
-      }
-      LogMenuAction(MENU_ACTION_WIN_CHROMEOS_RESTART);
-      break;
     case IDC_DISTILL_PAGE:
       if (!uma_action_recorded_) {
         UMA_HISTOGRAM_MEDIUM_TIMES("WrenchMenu.TimeToAction.DistillPage",
                                    delta);
       }
       LogMenuAction(MENU_ACTION_DISTILL_PAGE);
       break;
     case IDC_SAVE_PAGE:
       if (!uma_action_recorded_)
         UMA_HISTOGRAM_MEDIUM_TIMES("WrenchMenu.TimeToAction.SavePage", delta);
@@ skipping 367 matching lines @@
 #else
   AddItem(IDC_ABOUT, l10n_util::GetStringUTF16(IDS_ABOUT));
 #endif
 #if defined(OS_CHROMEOS)
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           chromeos::switches::kEnableRequestTabletSite))
     AddCheckItemWithStringId(IDC_TOGGLE_REQUEST_TABLET_SITE,
                              IDS_TOGGLE_REQUEST_TABLET_SITE);
 #endif
 
-#if defined(OS_WIN)
-  int command_id = IDC_WIN_DESKTOP_RESTART;
-  int string_id = IDS_WIN_DESKTOP_RESTART;
-  if (GetRestartMenuItemIfRequired(browser_->host_desktop_type(),
-                                   &command_id,
-                                   &string_id)) {
-    AddSeparator(ui::NORMAL_SEPARATOR);
-    AddItemWithStringId(command_id, string_id);
-  }
-#endif
-  bool show_exit_menu = browser_defaults::kShowExitMenuItem;
-#if defined(OS_WIN)
-  if (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH)
-    show_exit_menu = false;
-#endif
-  if (show_exit_menu) {
+  if (browser_defaults::kShowExitMenuItem) {
     AddSeparator(ui::NORMAL_SEPARATOR);
     AddItemWithStringId(IDC_EXIT, IDS_EXIT);
   }
   uma_action_recorded_ = false;
 }
 
 bool AppMenuModel::AddGlobalErrorMenuItems() {
   // TODO(sail): Currently we only build the app menu once per browser
   // window. This means that if a new error is added after the menu is built
   // it won't show in the existing app menu. To fix this we need to some
@@ skipping 80 matching lines @@
                        ->GetZoomPercent();
   }
   zoom_label_ = l10n_util::GetStringFUTF16(
       IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
 }
 
 void AppMenuModel::OnZoomLevelChanged(
     const content::HostZoomMap::ZoomLevelChange& change) {
   UpdateZoomControls();
 }