Move and rename Chrome's AppLauncherId to ash::AppLaunchId.

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::IsArcPlayStoreEnabledForProfile(profile()) &&
         arc::IsArcPlayStoreEnabledPreferenceManagedForProfile(profile()))
       return false;
   }
 
   return true;
 }
 
-void LauncherControllerHelper::LaunchApp(ash::AppLauncherId id,
+void LauncherControllerHelper::LaunchApp(ash::AppLaunchId id,
                                          ash::ShelfLaunchSource 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.
@@ skipping 28 matching lines @@
   params.launch_id = id.launch_id();
 
   OpenApplication(params);
 }
 
 ArcAppListPrefs* LauncherControllerHelper::GetArcAppListPrefs() const {
   return ArcAppListPrefs::Get(profile_);
 }
 
 void LauncherControllerHelper::ExtensionEnableFlowFinished() {
-  LaunchApp(ash::AppLauncherId(extension_enable_flow_->extension_id()),
+  LaunchApp(ash::AppLaunchId(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();
 }