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

ash/common/shelf/shelf_window_watcher_item_delegate.h

Index: ash/common/shelf/shelf_window_watcher_item_delegate.h
diff --git a/ash/common/shelf/shelf_window_watcher_item_delegate.h b/ash/common/shelf/shelf_window_watcher_item_delegate.h
index fd61f439ff19a73f2d61a3c696b82fded94c40bc..68f9ede8f45f0d8cd53b088aadb62d8f274f68e5 100644
--- a/ash/common/shelf/shelf_window_watcher_item_delegate.h
+++ b/ash/common/shelf/shelf_window_watcher_item_delegate.h
@@ -5,7 +5,7 @@
 #ifndef ASH_COMMON_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_
 #define ASH_COMMON_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_
 
-#include "ash/common/shelf/shelf_item_delegate.h"
+#include "ash/public/interfaces/shelf.mojom.h"
 #include "base/macros.h"
 
 namespace ash {
@@ -14,19 +14,18 @@ class WmWindow;
 
 // ShelfItemDelegate for the items created by ShelfWindowWatcher, for example:
 // The Chrome OS settings window, task manager window, and panel windows.
-class ShelfWindowWatcherItemDelegate : public ShelfItemDelegate {
+class ShelfWindowWatcherItemDelegate : public mojom::ShelfItemDelegate {
  public:
   ShelfWindowWatcherItemDelegate(ShelfID id, WmWindow* window);
   ~ShelfWindowWatcherItemDelegate() override;
 
  private:
-  // ShelfItemDelegate overrides:
-  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 overrides:
+  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;
 
   ShelfID id_;