Move LaunchContainer enum to extension_constants.h.

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 191 matching lines @@
   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::GetLaunchContainer(
       extensions_service->extension_prefs(), extension);
 
   if (!extensions::HasPreferredLaunchContainer(
           extensions_service->extension_prefs(), extension))
-    launch_container = extensions::LAUNCH_WINDOW;
+    launch_container = extensions::LAUNCH_CONTAINER_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,
                                  int* ret_num2) {
@@ skipping 141 matching lines @@
 
   AppListService::InitAll(profile);
   if (command_line_.HasSwitch(switches::kAppId)) {
     std::string app_id = command_line_.GetSwitchValueASCII(switches::kAppId);
     const Extension* extension = GetDisabledPlatformApp(profile, app_id);
     // If |app_id| is a disabled platform app we handle it specially here,
     // otherwise it will be handled below.
     if (extension) {
       RecordCmdLineAppHistogram(extensions::Manifest::TYPE_PLATFORM_APP);
       AppLaunchParams params(profile, extension,
-                             extensions::LAUNCH_NONE, NEW_WINDOW);
+                             extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW);
       params.command_line = &command_line_;
       params.current_directory = cur_dir_;
       OpenApplicationWithReenablePrompt(params);
       return true;
     }
   } else if (command_line_.HasSwitch(switches::kShowAppList)) {
     // This switch is used for shortcuts on the native desktop.
     AppListService::RecordShowTimings(command_line_);
     AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)->
         ShowForProfile(profile);
@@ skipping 90 matching lines @@
   // shortcuts.
   if (!IsAppLaunch(NULL, &app_id) || app_id.empty())
     return false;
 
   extensions::LaunchContainer launch_container;
   const Extension* extension;
   if (!GetAppLaunchContainer(profile, app_id, &extension, &launch_container))
     return false;
 
   // If the user doesn't want to open a tab, fail.
-  if (launch_container != extensions::LAUNCH_TAB)
+  if (launch_container != extensions::LAUNCH_CONTAINER_TAB)
     return false;
 
   RecordCmdLineAppHistogram(extension->GetType());
 
   WebContents* app_tab = OpenApplication(AppLaunchParams(
-      profile, extension, extensions::LAUNCH_TAB, NEW_FOREGROUND_TAB));
+      profile, extension, extensions::LAUNCH_CONTAINER_TAB,
+      NEW_FOREGROUND_TAB));
   return (app_tab != NULL);
 }
 
 bool StartupBrowserCreatorImpl::OpenApplicationWindow(
     Profile* profile,
     content::WebContents** out_app_contents) {
   // Set |out_app_contents| to NULL early on (just in case).
   if (out_app_contents)
     *out_app_contents = NULL;
 
   std::string url_string, app_id;
   if (!IsAppLaunch(&url_string, &app_id))
     return false;
 
   // This can fail if the app_id is invalid.  It can also fail if the
   // extension is external, and has not yet been installed.
   // TODO(skerner): Do something reasonable here. Pop up a warning panel?
   // Open an URL to the gallery page of the extension id?
   if (!app_id.empty()) {
     extensions::LaunchContainer launch_container;
     const Extension* extension;
     if (!GetAppLaunchContainer(profile, app_id, &extension, &launch_container))
       return false;
 
     // TODO(skerner): Could pass in |extension| and |launch_container|,
     // and avoid calling GetAppLaunchContainer() both here and in
     // OpenApplicationTab().
 
-    if (launch_container == extensions::LAUNCH_TAB)
+    if (launch_container == extensions::LAUNCH_CONTAINER_TAB)
       return false;
 
     RecordCmdLineAppHistogram(extension->GetType());
 
     AppLaunchParams params(profile, extension, launch_container, NEW_WINDOW);
     params.command_line = &command_line_;
     params.current_directory = cur_dir_;
     WebContents* tab_in_app_window = OpenApplication(params);
 
     if (out_app_contents)
@@ skipping 460 matching lines @@
 }
 
 #if !defined(OS_WIN)
 // static
 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser(
     Profile* profile,
     const std::vector<GURL>& startup_urls) {
   return false;
 }
 #endif