Decouple IsMetroProcess() calls, introducing IsSingleWindowMetroMode().

chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views_win.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/views/bookmarks/bookmark_context_menu_controller_views_win.h"
 
-#include "base/win/metro.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "ui/views/widget/widget.h"
+#include "win8/util/win8_util.h"
 
 using content::OpenURLParams;
 using content::UserMetricsAction;
 using content::WebContents;
 
 namespace {
 
 // A PageNavigator implementation that creates a new Browser. This is used when
 // opening a url and there is no Browser open. The Browser is created the first
 // time the PageNavigator method is invoked.
@@ skipping 56 matching lines @@
     : BookmarkContextMenuControllerViews(parent_widget, delegate, browser,
                                          profile, navigator, parent,
                                          selection) {
 }
 
 BookmarkContextMenuControllerViewsWin
     ::~BookmarkContextMenuControllerViewsWin() {
 }
 
 void BookmarkContextMenuControllerViewsWin::ExecuteCommand(int id) {
-  if (base::win::IsMetroProcess()) {
+  if (win8::IsSingleWindowMetroMode()) {
     switch (id) {
       // We need to handle the open in new window and open in incognito window
       // commands to ensure that they first look for an existing browser object
       // to handle the request. If we find one then a new foreground tab is
       // opened, else a new browser object is created.
       case IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW:
       case IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO: {
         Profile* profile_to_use = profile();
         if (id == IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW) {
           if (profile_to_use->IsOffTheRecord())
@@ skipping 35 matching lines @@
       default:
         break;
     }
   }
   BookmarkContextMenuControllerViews::ExecuteCommand(id);
 }
 
 bool BookmarkContextMenuControllerViewsWin::IsCommandEnabled(int id) const {
   // In Windows 8 metro mode no new window option on a regular chrome window
   // and no new incognito window option on an incognito chrome window.
-  if (base::win::IsMetroProcess()) {
+  if (win8::IsSingleWindowMetroMode()) {
     if (id == IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW &&
         !profile()->IsOffTheRecord()) {
       return false;
     } else if (id == IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO &&
                profile()->IsOffTheRecord()) {
       return false;
     }
   }
   return BookmarkContextMenuControllerViews::IsCommandEnabled(id);
 }