mash: Move LauncherItemController to ash, rename ShelfItemDelegate.

ash/common/shelf/shelf_model_observer.h

Index: ash/common/shelf/shelf_model_observer.h
diff --git a/ash/common/shelf/shelf_model_observer.h b/ash/common/shelf/shelf_model_observer.h
index 54ebfe6cee4b5353619c35ad8b6a4825d76fecec..c3897abff6b45feee98ebfe48695ef2cade233d5 100644
--- a/ash/common/shelf/shelf_model_observer.h
+++ b/ash/common/shelf/shelf_model_observer.h
@@ -7,6 +7,7 @@
 
 #include "ash/ash_export.h"
 #include "ash/public/cpp/shelf_item.h"
+#include "ash/public/cpp/shelf_item_delegate.h"
 
 namespace ash {
 
@@ -37,9 +38,8 @@ class ASH_EXPORT ShelfModelObserver {
   // |item_delegate| can be null.
   // NOTE: This is added a temporary fix for M39 to fix crbug.com/429870.
   // TODO(skuhne): Find the real reason for this problem and remove this fix.

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

Aside: I wonder if this problem will go away. At some point might be worth
deleting this hack, adding a CHECK somewhere, and seeing what happens.

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

I plan to remove the map in my next CL, that should make this moot.

-  virtual void OnSetShelfItemDelegate(
-      ShelfID id,
-      mojom::ShelfItemDelegate* item_delegate) = 0;
+  virtual void OnSetShelfItemDelegate(ShelfID id,
+                                      ShelfItemDelegate* item_delegate) = 0;

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

forward declare

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

Done.

 
  protected:
   virtual ~ShelfModelObserver() {}