Decouple IsMetroProcess() calls, introducing IsSingleWindowMetroMode().

chrome/browser/ui/extensions/application_launch.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/extensions/application_launch.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 12 matching lines @@
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/common/renderer_preferences.h"
 #include "ui/gfx/rect.h"
 
 #if defined(OS_WIN)
-#include "base/win/metro.h"
+#include "win8/util/win8_util.h"
 #endif
 
 using content::WebContents;
 using extensions::Extension;
 using extensions::ExtensionPrefs;
 
 namespace {
 
 // Get the launch URL for a given extension, with optional override/fallback.
 // |override_url|, if non-empty, will be preferred over the extension's
@@ skipping 63 matching lines @@
       params.initial_show_state = ui::SHOW_STATE_MAXIMIZED;
     else if (launch_type == ExtensionPrefs::LAUNCH_WINDOW)
       params.initial_show_state = ui::SHOW_STATE_NORMAL;
   }
 #endif
 
   Browser* browser = NULL;
 #if defined(OS_WIN)
   // In Chrome on Windows 8 in metro mode we don't allow multiple chrome
   // windows to be created, as we don't have a good way to switch between
   // them. We attempt to reuse an existing Browser window.

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

comment needs rewording

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

Done.

-  if (base::win::IsMetroProcess()) {
+  if (win8::IsSingleWindowMetroMode()) {
     browser = browser::FindBrowserWithProfile(
         profile, chrome::HOST_DESKTOP_TYPE_NATIVE);
   }
 #endif
   if (!browser)
     browser = new Browser(params);
 
   if (app_browser)
     *app_browser = browser;
 
@@ skipping 168 matching lines @@
   // OnDidGetApplicationInfo, which calls
   // web_app::UpdateShortcutForTabContents when it sees UPDATE_SHORTCUT as
   // pending web app action.
   extensions::TabHelper::FromWebContents(tab)->set_pending_web_app_action(
       extensions::TabHelper::UPDATE_SHORTCUT);
 
   return tab;
 }
 
 }  // namespace application_launch