Convert Extension* to extension id in AppLaunchParams.

apps/launcher.cc

 // Copyright 2013 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 "apps/launcher.h"
 
 #include "apps/apps_client.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 65 matching lines @@
     return !file_path->empty();
   }
 
   if (!current_directory.IsAbsolute())
     return false;
 
   *file_path = current_directory.Append(*file_path);
   return true;
 }
 
-bool GetAbsolutePathFromCommandLine(const CommandLine* command_line,
+bool GetAbsolutePathFromCommandLine(const CommandLine& command_line,
                                     const base::FilePath& current_directory,
                                     base::FilePath* path) {
-  if (!command_line || !command_line->GetArgs().size())
+  if (!command_line.GetArgs().size())
     return false;
 
-  base::FilePath relative_path(command_line->GetArgs()[0]);
+  base::FilePath relative_path(command_line.GetArgs()[0]);
   base::FilePath absolute_path(relative_path);
   if (!MakePathAbsolute(current_directory, &absolute_path)) {
     LOG(WARNING) << "Cannot make absolute path from " << relative_path.value();
     return false;
   }
   *path = absolute_path;
   return true;
 }
 
 // Helper method to launch the platform app |extension| with no data. This
@@ skipping 202 matching lines @@
   // The ID of the file handler used to launch the app.
   std::string handler_id_;
 
   DISALLOW_COPY_AND_ASSIGN(PlatformAppPathLauncher);
 };
 
 }  // namespace
 
 void LaunchPlatformAppWithCommandLine(Profile* profile,
                                       const Extension* extension,
-                                      const CommandLine* command_line,
+                                      const CommandLine& command_line,
                                       const base::FilePath& current_directory) {
   if (!AppsClient::Get()->CheckAppLaunch(profile, extension))
     return;
 
   // An app with "kiosk_only" should not be installed and launched
   // outside of ChromeOS kiosk mode in the first place. This is a defensive
   // check in case this scenario does occur.
   if (extensions::KioskModeInfo::IsKioskOnly(extension)) {
     bool in_kiosk_mode = false;
 #if defined(OS_CHROMEOS)
@@ skipping 23 matching lines @@
                                const base::FilePath& file_path) {
   // launcher will be freed when nothing has a reference to it. The message
   // queue will retain a reference for any outstanding task, so when the
   // launcher has finished it will be freed.
   scoped_refptr<PlatformAppPathLauncher> launcher =
       new PlatformAppPathLauncher(profile, extension, file_path);
   launcher->Launch();
 }
 
 void LaunchPlatformApp(Profile* profile, const Extension* extension) {
-  LaunchPlatformAppWithCommandLine(profile, extension, NULL, base::FilePath());
+  LaunchPlatformAppWithCommandLine(profile,
+                                   extension,
+                                   CommandLine(CommandLine::NO_PROGRAM),
+                                   base::FilePath());
 }
 
 void LaunchPlatformAppWithFileHandler(Profile* profile,
                                       const Extension* extension,
                                       const std::string& handler_id,
                                       const base::FilePath& file_path) {
   scoped_refptr<PlatformAppPathLauncher> launcher =
       new PlatformAppPathLauncher(profile, extension, file_path);
   launcher->LaunchWithHandler(handler_id);
 }
@@ skipping 31 matching lines @@
 void LaunchPlatformAppWithUrl(Profile* profile,
                               const Extension* extension,
                               const std::string& handler_id,
                               const GURL& url,
                               const GURL& referrer_url) {
   extensions::AppEventRouter::DispatchOnLaunchedEventWithUrl(
       profile, extension, handler_id, url, referrer_url);
 }
 
 }  // namespace apps