Move LaunchType out of ExtensionPrefs.

chrome/browser/ui/startup/startup_browser_creator_impl.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/startup/startup_browser_creator_impl.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "apps/app_restore_service.h"
@@ skipping 15 matching lines @@
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/auto_launch_trial.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/extension_creator.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
+#include "chrome/browser/extensions/launch_util.h"
 #include "chrome/browser/extensions/pack_extension_job.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/net/predictor.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/performance_monitor/startup_timer.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 150 matching lines @@
   // The extension with id |app_id| may have been uninstalled.
   if (!extension)
     return false;
 LOG(ERROR) << app_id;
   // Don't launch platform apps in incognito mode.
   if (profile->IsOffTheRecord() && extension->is_platform_app())
     return false;
 LOG(ERROR) << app_id;
   // Look at preferences to find the right launch container. If no
   // preference is set, launch as a window.
-  extensions::LaunchContainer launch_container =
-      extensions_service->extension_prefs()->GetLaunchContainer(extension);
+  extensions::LaunchContainer launch_container = extensions::GetLaunchContainer(
+      extensions_service->extension_prefs(), extension);
 
-  if (!extensions_service->extension_prefs()->HasPreferredLaunchContainer(
-          extension))
+  if (!extensions::HasPreferredLaunchContainer(
+          extensions_service->extension_prefs(), extension))
     launch_container = extensions::LAUNCH_WINDOW;
 
   *out_extension = extension;
   *out_launch_container = launch_container;
   return true;
 }
 
 // Parse two comma-separated integers from string. Return true on success.
 bool ParseCommaSeparatedIntegers(const std::string& str,
                                  int* ret_num1,
@@ skipping 769 matching lines @@
 }
 
 #if !defined(OS_WIN)
 // static
 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser(
     Profile* profile,
     const std::vector<GURL>& startup_urls) {
   return false;
 }
 #endif