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

ash/common/shelf/shelf_window_watcher_item_delegate.cc

Index: ash/common/shelf/shelf_window_watcher_item_delegate.cc
diff --git a/ash/common/shelf/shelf_window_watcher_item_delegate.cc b/ash/common/shelf/shelf_window_watcher_item_delegate.cc
index 01f4bd469afc7363230af6b68b7c9a0be0ef21e6..07e5e186890b56bcad749437ce4aabedad866a26 100644
--- a/ash/common/shelf/shelf_window_watcher_item_delegate.cc
+++ b/ash/common/shelf/shelf_window_watcher_item_delegate.cc
@@ -35,42 +35,39 @@ ShelfWindowWatcherItemDelegate::ShelfWindowWatcherItemDelegate(ShelfID id,
 
 ShelfWindowWatcherItemDelegate::~ShelfWindowWatcherItemDelegate() {}
 
-ShelfAction ShelfWindowWatcherItemDelegate::ItemSelected(
-    ui::EventType event_type,
-    int event_flags,
+void ShelfWindowWatcherItemDelegate::ItemSelected(
+    std::unique_ptr<ui::Event> event,
     int64_t display_id,
-    ShelfLaunchSource source) {
+    ShelfLaunchSource source,
+    const ItemSelectedCallback& callback) {
   // Move panels attached on another display to the current display.
   if (GetShelfItemType(id_) == TYPE_APP_PANEL &&
       window_->aura_window()->GetProperty(kPanelAttachedKey) &&
       wm::MoveWindowToDisplay(window_->aura_window(), display_id)) {
     window_->Activate();
-    return SHELF_ACTION_WINDOW_ACTIVATED;
+    callback.Run(SHELF_ACTION_WINDOW_ACTIVATED,
+                 std::vector<mojom::MenuItemPtr>());
+    return;
   }
 
   if (window_->IsActive()) {
-    if (event_type == ui::ET_KEY_RELEASED) {
+    if (event && event->type() == ui::ET_KEY_RELEASED) {
       window_->Animate(::wm::WINDOW_ANIMATION_TYPE_BOUNCE);
-      return SHELF_ACTION_NONE;
+      callback.Run(SHELF_ACTION_NONE, std::vector<mojom::MenuItemPtr>());
+      return;
     }
     window_->Minimize();
-    return SHELF_ACTION_WINDOW_MINIMIZED;
+    callback.Run(SHELF_ACTION_WINDOW_MINIMIZED,
+                 std::vector<mojom::MenuItemPtr>());
+    return;
   }
   window_->Activate();
-  return SHELF_ACTION_WINDOW_ACTIVATED;
-}
-
-ShelfAppMenuItemList ShelfWindowWatcherItemDelegate::GetAppMenuItems(
-    int event_flags) {
-  // Return an empty item list to avoid showing an application menu.
-  return ShelfAppMenuItemList();
+  callback.Run(SHELF_ACTION_WINDOW_ACTIVATED,
+               std::vector<mojom::MenuItemPtr>());
 }
 
 void ShelfWindowWatcherItemDelegate::ExecuteCommand(uint32_t command_id,
-                                                    int event_flags) {
-  // This delegate does not support showing an application menu.
-  NOTIMPLEMENTED();
-}
+                                                    int32_t event_flags) {}
 
 void ShelfWindowWatcherItemDelegate::Close() {
   window_->CloseWidget();