Revert of CL 722703002 due to build breakage

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 39 matching lines @@
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/signin/signin_promo.h"
 #include "chrome/browser/ui/app_list/app_list_service.h"
 #include "chrome/browser/ui/browser_commands.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_tabrestore.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/extensions/app_launch_params.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/browser/ui/host_desktop.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/google_api_keys_infobar_delegate.h"
 #include "chrome/browser/ui/startup/obsolete_system_infobar_delegate.h"
 #include "chrome/browser/ui/startup/session_crashed_bubble.h"
 #include "chrome/browser/ui/startup/session_crashed_infobar_delegate.h"
 #include "chrome/browser/ui/startup/startup_browser_creator.h"
@@ skipping 259 matching lines @@
     return true;
 
   if (command_line_.HasSwitch(switches::kAppId)) {
     std::string app_id = command_line_.GetSwitchValueASCII(switches::kAppId);
     const Extension* extension = GetPlatformApp(profile, app_id);
     // If |app_id| is a disabled or terminated 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_CONTAINER_NONE, NEW_WINDOW,
-                             extensions::SOURCE_COMMAND_LINE);
+                             extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW);
       params.command_line = command_line_;
       params.current_directory = cur_dir_;
       // If we are being launched from the command line, default to native
       // desktop.
       params.desktop_type = chrome::HOST_DESKTOP_TYPE_NATIVE;
       OpenApplicationWithReenablePrompt(params);
       return true;
     }
   }
 
@@ skipping 67 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 != extensions::LAUNCH_CONTAINER_TAB)
     return false;
 
   RecordCmdLineAppHistogram(extension->GetType());
 
-  WebContents* app_tab = OpenApplication(
-      AppLaunchParams(profile, extension, extensions::LAUNCH_CONTAINER_TAB,
-                      NEW_FOREGROUND_TAB, extensions::SOURCE_COMMAND_LINE));
+  WebContents* app_tab = OpenApplication(AppLaunchParams(
+      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;
 
@@ skipping 13 matching lines @@
 
     // TODO(skerner): Could pass in |extension| and |launch_container|,
     // and avoid calling GetAppLaunchContainer() both here and in
     // OpenApplicationTab().
 
     if (launch_container == extensions::LAUNCH_CONTAINER_TAB)
       return false;
 
     RecordCmdLineAppHistogram(extension->GetType());
 
-    AppLaunchParams params(profile, extension, launch_container, NEW_WINDOW,
-                           extensions::SOURCE_COMMAND_LINE);
+    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)
       *out_app_contents = tab_in_app_window;
 
     // Platform apps fire off a launch event which may or may not open a window.
     return (tab_in_app_window != NULL || CanLaunchViaEvent(extension));
   }
@@ skipping 428 matching lines @@
       // behavior is desired because completing or skipping the sync promo
       // causes a redirect to the NTP.
       if (!startup_urls->empty() &&
           startup_urls->at(0) == GURL(chrome::kChromeUINewTabURL))
         startup_urls->at(0) = sync_promo_url;
       else
         startup_urls->insert(startup_urls->begin(), sync_promo_url);
     }
   }
 }