mash: Use mojo for ShelfItemDelegate and [app] MenuItem.

ash/common/shelf/app_list_shelf_item_delegate.h

Index: ash/common/shelf/app_list_shelf_item_delegate.h
diff --git a/ash/common/shelf/app_list_shelf_item_delegate.h b/ash/common/shelf/app_list_shelf_item_delegate.h
index 88f09d27a2c2f69c15e822b1c9d4a2c2d08cb0ee..10d09004960b558792e0cfa6d902ed1fbc31586a 100644
--- a/ash/common/shelf/app_list_shelf_item_delegate.h
+++ b/ash/common/shelf/app_list_shelf_item_delegate.h
@@ -5,14 +5,14 @@
 #ifndef ASH_COMMON_SHELF_APP_LIST_SHELF_ITEM_DELEGATE_H_
 #define ASH_COMMON_SHELF_APP_LIST_SHELF_ITEM_DELEGATE_H_
 
-#include "ash/common/shelf/shelf_item_delegate.h"
+#include "ash/public/interfaces/shelf.mojom.h"
 #include "base/macros.h"
 
 namespace ash {
 class ShelfModel;
 
 // ShelfItemDelegate for TYPE_APP_LIST.
-class AppListShelfItemDelegate : public ShelfItemDelegate {
+class AppListShelfItemDelegate : public mojom::ShelfItemDelegate {
  public:
   // Initializes the app list item in the shelf data model and creates an
   // AppListShelfItemDelegate which will be owned by |model|.
@@ -21,13 +21,12 @@ class AppListShelfItemDelegate : public ShelfItemDelegate {
   AppListShelfItemDelegate();
   ~AppListShelfItemDelegate() override;
 
-  // ShelfItemDelegate:
-  ShelfAction ItemSelected(ui::EventType event_type,
-                           int event_flags,
-                           int64_t display_id,
-                           ShelfLaunchSource source) override;
-  ShelfAppMenuItemList GetAppMenuItems(int event_flags) override;
-  void ExecuteCommand(uint32_t command_id, int event_flags) override;
+  // mojom::ShelfItemDelegate:
+  void ItemSelected(std::unique_ptr<ui::Event> event,
+                    int64_t display_id,
+                    ShelfLaunchSource source,
+                    const ItemSelectedCallback& callback) override;
+  void ExecuteCommand(uint32_t command_id, int32_t event_flags) override;
   void Close() override;
 
  private: