Pass command line arguments through with --load-and-launch-app.

chrome/browser/ui/startup/startup_browser_creator.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.h"
 
 #include <algorithm>   // For max().
 #include <set>
 
 #include "apps/app_load_service.h"
@@ skipping 604 matching lines @@
   // of an automation request), we are done here.
   if (silent_launch)
     return true;
 
   // Check for --load-and-launch-app.
   if (command_line.HasSwitch(apps::kLoadAndLaunchApp) &&
       !IncognitoModePrefs::ShouldLaunchIncognito(
           command_line, last_used_profile->GetPrefs())) {
     CommandLine::StringType path = command_line.GetSwitchValueNative(
         apps::kLoadAndLaunchApp);
-    std::string extension_id;
-    if (!extensions::UnpackedInstaller::Create(
-            last_used_profile->GetExtensionService())->
-                LoadFromCommandLine(base::FilePath(path), &extension_id)) {
+
+    if (!apps::AppLoadService::Get(last_used_profile)->LoadAndLaunch(
+            base::FilePath(path), command_line, cur_dir)) {
       return false;
     }
 
-    // Schedule the app to be launched once loaded.
-    apps::AppLoadService::Get(last_used_profile)->ScheduleLaunchOnLoad(
-        extension_id);
-
     // Return early here since we don't want to open a browser window.
     // The exception is when there are no browser windows, since we don't want
     // chrome to shut down.
     // TODO(jackhou): Do this properly once keep-alive is handled by the
     // background page of apps. Tracked at http://crbug.com/175381
     if (chrome::GetTotalBrowserCountForProfile(last_used_profile) != 0)
       return true;
   }
 
   chrome::startup::IsProcessStartup is_process_startup = process_startup ?
@@ skipping 104 matching lines @@
 
 // static
 bool StartupBrowserCreator::ActivatedProfile() {
   return profile_launch_observer.Get().activated_profile();
 }
 
 bool HasPendingUncleanExit(Profile* profile) {
   return profile->GetLastSessionExitType() == Profile::EXIT_CRASHED &&
       !profile_launch_observer.Get().HasBeenLaunched(profile);
 }