mash: Move LauncherItemController to ash, rename ShelfItemDelegate.

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

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
index b88d3d570254b0f9e5cb38828f47b962a3e5a1ea..63e8c02dbdc5212d2e0955b2b4a920a855d293a9 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
@@ -11,12 +11,12 @@
 
 #include "ash/public/cpp/app_launch_id.h"
 #include "ash/public/cpp/shelf_item.h"
+#include "ash/public/cpp/shelf_item_delegate.h"
 #include "ash/public/interfaces/shelf.mojom.h"
 #include "base/auto_reset.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/launcher/launcher_item_controller.h"
 #include "chrome/browser/ui/ash/launcher/settings_window_observer.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
 
@@ -75,7 +75,7 @@ class ChromeLauncherController : public ash::mojom::ShelfObserver,
   void Init();
 
   // Creates a new app item on the shelf for |controller|.
-  virtual ash::ShelfID CreateAppLauncherItem(LauncherItemController* controller,
+  virtual ash::ShelfID CreateAppLauncherItem(ash::ShelfItemDelegate* controller,

[James Cook, 2017/04/04 15:34:45]

kinda weird that these item delegates are named "controller". Maybe
item_delegate?

[msw, 2017/04/04 18:53:09]

Done.

                                              ash::ShelfItemStatus status) = 0;
 
   // Returns the shelf item with the given id, or null if |id| isn't found.
@@ -92,7 +92,7 @@ class ChromeLauncherController : public ash::mojom::ShelfObserver,
   // Takes ownership of |controller|.
   // TODO(skuhne): Pass in scoped_ptr to make ownership clear.

[James Cook, 2017/04/04 15:34:45]

Is now a good time to resolve this TODO?

[msw, 2017/04/04 18:53:09]

Done, but what a pain... this wasn't simple.

[James Cook, 2017/04/04 23:57:26]

Thanks for doing it.

   virtual void SetItemController(ash::ShelfID id,
-                                 LauncherItemController* controller) = 0;
+                                 ash::ShelfItemDelegate* controller) = 0;
 
   // Closes or unpins the shelf item.
   virtual void CloseLauncherItem(ash::ShelfID id) = 0;
@@ -165,7 +165,7 @@ class ChromeLauncherController : public ash::mojom::ShelfObserver,
   virtual void AdditionalUserAddedToSession(Profile* profile) = 0;
 
   // Get the list of all running incarnations of this item.
-  virtual MenuItemList GetAppMenuItemsForTesting(
+  virtual ash::MenuItemList GetAppMenuItemsForTesting(
       const ash::ShelfItem& item) = 0;
 
   // Get the list of all tabs which belong to a certain application type.
@@ -198,11 +198,11 @@ class ChromeLauncherController : public ash::mojom::ShelfObserver,
   virtual base::string16 GetAppListTitle(
       content::WebContents* web_contents) const = 0;
 
-  // Returns the LauncherItemController of BrowserShortcut.
+  // Returns the ash::ShelfItemDelegate of BrowserShortcut.
   virtual BrowserShortcutLauncherItemController*
   GetBrowserShortcutLauncherItemController() = 0;
 
-  virtual LauncherItemController* GetLauncherItemController(
+  virtual ash::ShelfItemDelegate* GetLauncherItemController(

[James Cook, 2017/04/04 15:34:45]

Likewise, continuing to call this GetLauncherItemController() is weird. This
needs to be renamed, either in this CL or a followup.

[msw, 2017/04/04 18:53:09]

Done. Sadly, these renames take time...

       const ash::ShelfID id) = 0;
 
   // Check if the shelf visibility (location, visibility) will change with a new