Centralize command line checks for kEnableStreamlinedHostedApps.

chrome/browser/extensions/launch_util.cc

 // Copyright (c) 2013 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/launch_util.h"
 
-#include "base/command_line.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_sync_service.h"
+#include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/host_desktop.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/pref_names.h"
 #include "extensions/common/extension.h"
 
 #if defined(USE_ASH)
 #include "ash/shell.h"
 #endif
@@ skipping 17 matching lines @@
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 }  // namespace launch_util
 
 LaunchType GetLaunchType(const ExtensionPrefs* prefs,
                          const Extension* extension) {
   LaunchType result = LAUNCH_TYPE_DEFAULT;
 
   // Launch hosted apps as windows by default for streamlined hosted apps.
-  if (CommandLine::ForCurrentProcess()->
-          HasSwitch(switches::kEnableStreamlinedHostedApps) &&
+  if (util::IsStreamlinedHostedAppsEnabled() &&
       extension->id() != extension_misc::kChromeAppId) {
     result = LAUNCH_TYPE_WINDOW;
   }
 
   int value = GetLaunchTypePrefValue(prefs, extension->id());
   if (value >= LAUNCH_TYPE_FIRST && value < NUM_LAUNCH_TYPES)
     result = static_cast<LaunchType>(value);
 
 #if defined(OS_MACOSX)
     // App windows are not yet supported on mac.  Pref sync could make
@@ skipping 87 matching lines @@
 bool HasPreferredLaunchContainer(const ExtensionPrefs* prefs,
                                  const Extension* extension) {
   int value = -1;
   LaunchContainer manifest_launch_container =
       AppLaunchInfo::GetLaunchContainer(extension);
   return manifest_launch_container == LAUNCH_CONTAINER_TAB &&
       prefs->ReadPrefAsInteger(extension->id(), kPrefLaunchType, &value);
 }
 
 }  // namespace extensions