Remove extension application launch code from Browser

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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
@@ skipping 27 matching lines @@
 #include "chrome/browser/protector/protector_service_factory.h"
 #include "chrome/browser/protector/protector_utils.h"
 #include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/browser/ui/startup/autolaunch_prompt.h"
 #include "chrome/browser/ui/startup/bad_flags_prompt.h"
 #include "chrome/browser/ui/startup/default_browser_prompt.h"
 #include "chrome/browser/ui/startup/obsolete_os_prompt.h"
 #include "chrome/browser/ui/startup/session_crashed_prompt.h"
 #include "chrome/browser/ui/startup/startup_browser_creator.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
@@ skipping 332 matching lines @@
   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 != extension_misc::LAUNCH_TAB)
     return false;
 
   RecordCmdLineAppHistogram();
 
-  WebContents* app_tab = Browser::OpenApplicationTab(profile, extension, GURL(),
-                                                     NEW_FOREGROUND_TAB);
+  WebContents* app_tab = application_launch::OpenApplicationTab(
+      profile, extension, GURL(), NEW_FOREGROUND_TAB);
   return (app_tab != NULL);
 }
 
 bool StartupBrowserCreatorImpl::OpenApplicationWindow(Profile* profile) {
   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()) {
     extension_misc::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 == extension_misc::LAUNCH_TAB)
       return false;
 
     RecordCmdLineAppHistogram();
-    WebContents* tab_in_app_window = Browser::OpenApplication(
+    WebContents* tab_in_app_window = application_launch::OpenApplication(
         profile, extension, launch_container, GURL(), NEW_WINDOW);
     // Platform apps fire off a launch event which may or may not open a window.
     return (tab_in_app_window != NULL || extension->is_platform_app());
   }
 
   if (url_string.empty())
     return false;
 
 #if defined(OS_WIN)  // Fix up Windows shortcuts.
   ReplaceSubstringsAfterOffset(&url_string, 0, "\\x", "%");
 #endif
   GURL url(url_string);
 
   // Restrict allowed URLs for --app switch.
   if (!url.is_empty() && url.is_valid()) {
     ChildProcessSecurityPolicy *policy =
         ChildProcessSecurityPolicy::GetInstance();
     if (policy->IsWebSafeScheme(url.scheme()) ||
         url.SchemeIs(chrome::kFileScheme)) {
 
       if (profile->GetExtensionService()->IsInstalledApp(url)) {
         RecordCmdLineAppHistogram();
       } else {
         AppLauncherHandler::RecordAppLaunchType(
             extension_misc::APP_LAUNCH_CMD_LINE_APP_LEGACY);
       }
-      WebContents* app_tab = Browser::OpenAppShortcutWindow(
+      WebContents* app_tab = application_launch::OpenAppShortcutWindow(
           profile,
           url,
           true);  // Update app info.
       return (app_tab != NULL);
     }
   }
   return false;
 }
 
 void StartupBrowserCreatorImpl::ProcessLaunchURLs(
@@ skipping 391 matching lines @@
         // New:
         prefs->GetString(prefs::kHomePage),
         prefs->GetBoolean(prefs::kHomePageIsNewTabPage),
         prefs->GetBoolean(prefs::kShowHomeButton),
         // Backup:
         backup_homepage,
         backup_homepage_is_ntp,
         backup_show_home_button));
   }
 }