mash: Move LauncherItemController to ash, rename ShelfItemDelegate.

ash/common/shelf/shelf_application_menu_model.h

Index: ash/common/shelf/shelf_application_menu_model.h
diff --git a/ash/common/shelf/shelf_application_menu_model.h b/ash/common/shelf/shelf_application_menu_model.h
index 8b3e90cd4c2404521fa27cb05d35f97a5207cc4d..e50b231bf2ace4098c1ab20984a9c5e07796d52e 100644
--- a/ash/common/shelf/shelf_application_menu_model.h
+++ b/ash/common/shelf/shelf_application_menu_model.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "ash/ash_export.h"
-#include "ash/public/interfaces/shelf.mojom.h"
+#include "ash/public/cpp/shelf_item_delegate.h"

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

Can you forward declare this now?

(I like to avoid recursive include of mojom headers when I can.)

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

Done for ShelfItemDelegate, but we need shelf.mojom.h for mojom::MenuItemPtr.

 #include "base/macros.h"
 #include "ui/base/models/simple_menu_model.h"
 
@@ -34,7 +34,7 @@ class ASH_EXPORT ShelfApplicationMenuModel
   // |delegate| may be null in unit tests that do not execute commands.
   ShelfApplicationMenuModel(const base::string16& title,
                             std::vector<mojom::MenuItemPtr> items,
-                            mojom::ShelfItemDelegate* delegate);
+                            ShelfItemDelegate* delegate);
   ~ShelfApplicationMenuModel() override;
 
   // ui::SimpleMenuModel::Delegate:
@@ -53,7 +53,7 @@ class ASH_EXPORT ShelfApplicationMenuModel
   std::vector<mojom::MenuItemPtr> items_;
 
   // The shelf item delegate that created the menu and executes its commands.
-  mojom::ShelfItemDelegate* delegate_;
+  ShelfItemDelegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfApplicationMenuModel);
 };