Decouple IsMetroProcess() calls, introducing IsSingleWindowMetroMode().

chrome/browser/sessions/session_restore.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/sessions/session_restore.h"
 
 #include <algorithm>
 #include <list>
 #include <set>
 #include <string>
@@ skipping 36 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "net/base/network_change_notifier.h"
 #include "webkit/glue/glue_serialize.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #endif
 
 #if defined(OS_WIN)
-#include "base/win/metro.h"
+#include "win8/util/win8_util.h"
 #endif
 
 #if defined(USE_ASH)
 #include "ash/wm/window_util.h"
 #endif
 using content::NavigationController;
 using content::RenderWidgetHost;
 using content::WebContents;
 
 namespace {
@@ skipping 729 matching lines @@
         "SessionRestore-CreateRestoredBrowser-Start", false);
 #endif
         // Show the first window if none are visible.
         ui::WindowShowState show_state = (*i)->show_state;
         if (!has_visible_browser) {
           show_state = ui::SHOW_STATE_NORMAL;
           has_visible_browser = true;
         }
         browser = NULL;
 #if defined(OS_WIN)
-        if (base::win::IsMetroProcess()) {
+        if (win8::IsSingleWindowMetroMode()) {
           // We don't want to add tabs to the off the record browser.
           if (browser_ && !browser_->profile()->IsOffTheRecord()) {
             browser = browser_;
           } else {
             browser = last_browser;
             // last_browser should never be off the record either.
             // We don't set browser higher above when browser_ is offtherecord,
             // and CreateRestoredBrowser below, is never created offtherecord.
             DCHECK(!browser || !browser->profile()->IsOffTheRecord());
           }
@@ skipping 367 matching lines @@
   if (active_session_restorers == NULL)
     return false;
   for (std::set<SessionRestoreImpl*>::const_iterator it =
            active_session_restorers->begin();
        it != active_session_restorers->end(); ++it) {
     if ((*it)->profile() == profile)
       return true;
   }
   return false;
 }