mash: Move LauncherItemController to ash, rename ShelfItemDelegate.

ash/common/shelf/shelf_model.h

Index: ash/common/shelf/shelf_model.h
diff --git a/ash/common/shelf/shelf_model.h b/ash/common/shelf/shelf_model.h
index 877b70651816788aeb8bed393b21109cd35e8fc4..da10e99c68fb98a113565334b9425bf493ea363a 100644
--- a/ash/common/shelf/shelf_model.h
+++ b/ash/common/shelf/shelf_model.h
@@ -10,6 +10,7 @@
 
 #include "ash/ash_export.h"
 #include "ash/public/cpp/shelf_item.h"
+#include "ash/public/cpp/shelf_item_delegate.h"

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

Can you forward declare this now?

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

Done.

 #include "ash/public/interfaces/shelf.mojom.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
@@ -76,12 +77,11 @@ class ASH_EXPORT ShelfModel {
   int item_count() const { return static_cast<int>(items_.size()); }
 
   // Set |item_delegate| for |id| and takes ownership.
-  void SetShelfItemDelegate(
-      ShelfID id,
-      std::unique_ptr<mojom::ShelfItemDelegate> item_delegate);
+  void SetShelfItemDelegate(ShelfID id,
+                            std::unique_ptr<ShelfItemDelegate> item_delegate);
 
   // Returns ShelfItemDelegate for |id|, or null if none exists.
-  mojom::ShelfItemDelegate* GetShelfItemDelegate(ShelfID id);
+  ShelfItemDelegate* GetShelfItemDelegate(ShelfID id);
 
   void AddObserver(ShelfModelObserver* observer);
   void RemoveObserver(ShelfModelObserver* observer);
@@ -101,7 +101,7 @@ class ASH_EXPORT ShelfModel {
   ShelfItems items_;
   base::ObserverList<ShelfModelObserver> observers_;
 
-  std::map<ShelfID, std::unique_ptr<mojom::ShelfItemDelegate>>
+  std::map<ShelfID, std::unique_ptr<ShelfItemDelegate>>
       id_to_item_delegate_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfModel);