Decouple IsMetroProcess() calls, introducing IsSingleWindowMetroMode().

chrome/browser/extensions/extension_prefs.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/extensions/extension_prefs.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_notifier.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
@@ skipping 13 matching lines @@
 #include "chrome/common/extensions/permissions/permission_set.h"
 #include "chrome/common/extensions/permissions/permissions_info.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/common/url_pattern.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_WIN)
-#include "base/win/metro.h"
+#include "win8/util/win8_util.h"
 #endif  // OS_WIN
 
 namespace extensions {
 
 namespace {
 
 // Additional preferences keys
 
 // Whether this extension was running when chrome last shutdown.
 const char kPrefRunning[] = "running";
@@ skipping 1170 matching lines @@
   }
   #if defined(OS_MACOSX)
     // App windows are not yet supported on mac.  Pref sync could make
     // the launch type LAUNCH_WINDOW, even if there is no UI to set it
     // on mac.
     if (!extension->is_platform_app() && result == LAUNCH_WINDOW)
       result = LAUNCH_REGULAR;
   #endif
 
 #if defined(OS_WIN)
     // We don't support app windows in windows 8 metro mode.

[cpu_(ooo_6.6-7.5), 2012/12/03 20:56:26]

the comment needs rewording 

[gab, 2012/12/04 00:19:06]

Done.

-    if (base::win::IsMetroProcess() && result == LAUNCH_WINDOW)
+    if (win8::IsSingleWindowMetroMode() && result == LAUNCH_WINDOW)
       result = LAUNCH_REGULAR;
 #endif  // OS_WIN
 
   return result;
 }
 
 extension_misc::LaunchContainer ExtensionPrefs::GetLaunchContainer(
     const Extension* extension,
     ExtensionPrefs::LaunchType default_pref_value) {
   extension_misc::LaunchContainer manifest_launch_container =
@@ skipping 1083 matching lines @@
     const ExtensionIdList& strings) {
   ListPrefUpdate update(prefs_, pref);
   ListValue* list_of_values = update.Get();
   list_of_values->Clear();
   for (ExtensionIdList::const_iterator iter = strings.begin();
        iter != strings.end(); ++iter)
     list_of_values->Append(new StringValue(*iter));
 }
 
 }  // namespace extensions