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

ash/shell/window_watcher_shelf_item_delegate.h

Index: ash/shell/window_watcher_shelf_item_delegate.h
diff --git a/ash/shell/window_watcher_shelf_item_delegate.h b/ash/shell/window_watcher_shelf_item_delegate.h
index 73bb422c1f5ec28299c8c7c5e2ba8d42c0e261be..d6a9a5ff4a59eaa40bdcaef0e283bcc48317abff 100644
--- a/ash/shell/window_watcher_shelf_item_delegate.h
+++ b/ash/shell/window_watcher_shelf_item_delegate.h
@@ -5,8 +5,8 @@
 #ifndef ASH_SHELL_WINDOW_WATCHER_SHELF_ITEM_DELEGATE_H_
 #define ASH_SHELL_WINDOW_WATCHER_SHELF_ITEM_DELEGATE_H_
 
-#include "ash/common/shelf/shelf_item_delegate.h"
 #include "ash/common/shelf/shelf_item_types.h"
+#include "ash/public/interfaces/shelf.mojom.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 
@@ -16,18 +16,17 @@ namespace shell {
 class WindowWatcher;
 
 // ShelfItemDelegate implementation used by WindowWatcher.
-class WindowWatcherShelfItemDelegate : public ShelfItemDelegate {
+class WindowWatcherShelfItemDelegate : public mojom::ShelfItemDelegate {
  public:
   WindowWatcherShelfItemDelegate(ShelfID id, WindowWatcher* watcher);
   ~WindowWatcherShelfItemDelegate() 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: