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

chrome/browser/ui/ash/launcher/chrome_launcher_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
+#include "ash/public/cpp/app_launch_id.h"
 #include "ash/public/cpp/shelf_item.h"
 #include "ash/public/interfaces/shelf.mojom.h"
 #include "chrome/browser/ui/app_icon_loader.h"
 #include "chrome/browser/ui/app_icon_loader_delegate.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
-#include "chrome/browser/ui/ash/app_launcher_id.h"
 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
 #include "chrome/browser/ui/ash/launcher/settings_window_observer.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
 
 class AccountId;
 class ArcAppDeferredLauncherController;
 class BrowserShortcutLauncherItemController;
 class GURL;
 class LauncherControllerHelper;
 
@@ skipping 97 matching lines @@
 
   // Closes the specified item.
   virtual void Close(ash::ShelfID id) = 0;
 
   // Returns true if the specified item is open.
   virtual bool IsOpen(ash::ShelfID id) = 0;
 
   // Returns true if the specified item is for a platform app.
   virtual bool IsPlatformApp(ash::ShelfID id) = 0;
 
-  // Opens a new instance of the application identified by the AppLauncherId.
+  // Opens a new instance of the application identified by the AppLaunchId.
   // Used by the app-list, and by pinned-app shelf items.
-  void LaunchApp(ash::AppLauncherId id,
+  void LaunchApp(ash::AppLaunchId id,
                  ash::ShelfLaunchSource source,
                  int event_flags);
 
   // If |app_id| is running, reactivates the app's most recently active window,
   // otherwise launches and activates the app.
   // Used by the app-list, and by pinned-app shelf items.
   virtual void ActivateApp(const std::string& app_id,
                            ash::ShelfLaunchSource source,
                            int event_flags) = 0;
 
@@ skipping 156 matching lines @@
   // An observer that manages the shelf title and icon for settings windows.
   SettingsWindowObserver settings_window_observer_;
 
   // Used to load the images for app items.
   std::vector<std::unique_ptr<AppIconLoader>> app_icon_loaders_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_