mash: Move LauncherItemController to ash, rename ShelfItemDelegate.

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

Index: chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h
diff --git a/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h b/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h
index 42ce48da74bdb210317efdda0abb5619dbddc9e0..1a51984d55ff314453835ac3bdd8477919e05362 100644
--- a/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h
+++ b/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h
@@ -8,9 +8,9 @@
 #include <list>
 #include <string>
 
+#include "ash/public/cpp/shelf_item_delegate.h"
 #include "base/macros.h"
 #include "base/scoped_observer.h"
-#include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
 #include "ui/aura/window_observer.h"
 
 namespace aura {
@@ -21,15 +21,13 @@ namespace ui {
 class BaseWindow;
 }
 
-class ChromeLauncherController;
-
-// This is a LauncherItemController for abstract app windows (extension or ARC).
+// This is a ShelfItemDelegate for abstract app windows (extension or ARC).
 // There is one instance per app, per launcher id. For apps with multiple
 // windows, each item controller keeps track of all windows associated with the
 // app and their activation order. Instances are owned by ash::ShelfModel.
 //
 // Tests are in chrome_launcher_controller_impl_browsertest.cc
-class AppWindowLauncherItemController : public LauncherItemController,
+class AppWindowLauncherItemController : public ash::ShelfItemDelegate,
                                         public aura::WindowObserver {
  public:
   using WindowList = std::list<ui::BaseWindow*>;
@@ -42,7 +40,7 @@ class AppWindowLauncherItemController : public LauncherItemController,
   void SetActiveWindow(aura::Window* window);
   ui::BaseWindow* GetAppWindow(aura::Window* window);
 
-  // LauncherItemController overrides:
+  // ash::ShelfItemDelegate overrides:
   AppWindowLauncherItemController* AsAppWindowLauncherItemController() override;
   void ItemSelected(std::unique_ptr<ui::Event> event,
                     int64_t display_id,
@@ -65,8 +63,8 @@ class AppWindowLauncherItemController : public LauncherItemController,
   const WindowList& windows() const { return windows_; }
 
  protected:
-  AppWindowLauncherItemController(const ash::AppLaunchId& app_launch_id,
-                                  ChromeLauncherController* controller);
+  explicit AppWindowLauncherItemController(
+      const ash::AppLaunchId& app_launch_id);
 
   // Called when app window is removed from controller.
   virtual void OnWindowRemoved(ui::BaseWindow* window) {}