Remove LauncherItemController::Launch, cleanup.

chrome/browser/ui/ash/launcher/launcher_controller_helper.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/ash/launcher/launcher_controller_helper.h"
 
 #include <vector>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 151 matching lines @@
     if (!arc_session_manager->IsAllowed())
       return false;
     if (!arc_session_manager->IsArcEnabled() &&
         arc_session_manager->IsArcManaged())
       return false;
   }
 
   return true;
 }
 
-void LauncherControllerHelper::LaunchApp(const std::string& app_id,
+void LauncherControllerHelper::LaunchApp(ash::launcher::AppLauncherId id,
                                          ash::LaunchSource source,
                                          int event_flags) {
-  LaunchAppWithLaunchId(app_id, "", source, event_flags);
-}
-
-void LauncherControllerHelper::LaunchAppWithLaunchId(
-    const std::string& app_id,
-    const std::string& launch_id,
-    ash::LaunchSource source,
-    int event_flags) {
+  const std::string& app_id = id.app_id();
   const ArcAppListPrefs* arc_prefs = GetArcAppListPrefs();
   if (arc_prefs && arc_prefs->IsRegistered(app_id)) {
     arc::LaunchApp(profile_, app_id, event_flags);
     return;
   }
 
   // |extension| could be null when it is being unloaded for updating.
   const extensions::Extension* extension = GetExtensionByID(profile_, app_id);
   if (!extension)
     return;
@@ skipping 15 matching lines @@
   if (source != ash::LAUNCH_FROM_UNKNOWN &&
       app_id == extensions::kWebStoreAppId) {
     // Get the corresponding source string.
     std::string source_value = GetSourceFromAppListSource(source);
 
     // Set an override URL to include the source.
     GURL extension_url = extensions::AppLaunchInfo::GetFullLaunchURL(extension);
     params.override_url = net::AppendQueryParameter(
         extension_url, extension_urls::kWebstoreSourceField, source_value);
   }
-  params.launch_id = launch_id;
+  params.launch_id = id.launch_id();
 
   OpenApplication(params);
 }
 
 ArcAppListPrefs* LauncherControllerHelper::GetArcAppListPrefs() const {
   return ArcAppListPrefs::Get(profile_);
 }
 
 void LauncherControllerHelper::ExtensionEnableFlowFinished() {
-  LaunchApp(extension_enable_flow_->extension_id(), ash::LAUNCH_FROM_UNKNOWN,
-            ui::EF_NONE);
+  LaunchApp(
+      ash::launcher::AppLauncherId(extension_enable_flow_->extension_id()),
+      ash::LAUNCH_FROM_UNKNOWN, ui::EF_NONE);
   extension_enable_flow_.reset();
 }
 
 void LauncherControllerHelper::ExtensionEnableFlowAborted(bool user_initiated) {
   extension_enable_flow_.reset();
 }