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..194e202675ce111c1b70522a39f44110ff8528fe 100644
--- a/ash/common/shelf/shelf_model_observer.h
+++ b/ash/common/shelf/shelf_model_observer.h
@@ -6,15 +6,12 @@
 #define ASH_COMMON_SHELF_SHELF_MODEL_OBSERVER_H_
 
 #include "ash/ash_export.h"
-#include "ash/public/cpp/shelf_item.h"
+#include "ash/public/cpp/shelf_types.h"
 
 namespace ash {
 
 struct ShelfItem;
-
-namespace mojom {
 class ShelfItemDelegate;
-}
 
 class ASH_EXPORT ShelfModelObserver {
  public:
@@ -37,9 +34,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.
-  virtual void OnSetShelfItemDelegate(
-      ShelfID id,
-      mojom::ShelfItemDelegate* item_delegate) = 0;
+  virtual void OnSetShelfItemDelegate(ShelfID id,
+                                      ShelfItemDelegate* item_delegate) = 0;
 
  protected:
   virtual ~ShelfModelObserver() {}