Decouple IsMetroProcess() calls, introducing IsSingleWindowMetroMode().

chrome/browser/ui/toolbar/wrench_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/wrench_menu_model.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/command_line.h"
@@ skipping 53 matching lines @@
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #endif
 
 #if defined(OS_WIN)
 #include "base/win/metro.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/enumerate_modules_model_win.h"
 #include "chrome/browser/ui/metro_pin_tab_helper_win.h"
+#include "win8/util/win8_util.h"
 #endif
 
 #if defined(USE_ASH)
 #include "ash/shell.h"
 #endif
 
 using content::HostZoomMap;
 using content::UserMetricsAction;
 using content::WebContents;
 
@@ skipping 383 matching lines @@
 }
 
 void WrenchMenuModel::Build(bool is_new_menu, bool supports_new_separators) {
 #if defined(USE_AURA)
   if (is_new_menu)
     AddSeparator(ui::SPACING_SEPARATOR);
 #endif
 
   AddItemWithStringId(IDC_NEW_TAB, IDS_NEW_TAB);
 #if defined(OS_WIN)
-  if (base::win::IsMetroProcess()) {
-    // In Metro, we only show the New Window options if there isn't already
-    // a window of the requested type (incognito or not) that is available.
+  if (win8::IsSingleWindowMetroMode()) {
+    // In Win8's single window Metro mode, we only show the New Window options
+    // if there isn't already a window of the requested type (incognito or not)
+    // that is available.
     if (browser_->profile()->IsOffTheRecord()) {
       if (browser::FindBrowserWithProfile(
               browser_->profile()->GetOriginalProfile(),
               browser_->host_desktop_type()) == NULL) {
         AddItemWithStringId(IDC_NEW_WINDOW, IDS_NEW_WINDOW);
       }
     } else if (!browser_->profile()->HasOffTheRecordProfile()) {
       AddItemWithStringId(IDC_NEW_INCOGNITO_WINDOW, IDS_NEW_INCOGNITO_WINDOW);
     }
   } else {
@@ skipping 232 matching lines @@
   zoom_label_ = l10n_util::GetStringFUTF16(
       IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
 }
 
 string16 WrenchMenuModel::GetSyncMenuLabel() const {
   Profile* profile = browser_->profile()->GetOriginalProfile();
   return sync_ui_util::GetSyncMenuLabel(
       ProfileSyncServiceFactory::GetForProfile(profile),
       *SigninManagerFactory::GetForProfile(profile));
 }