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

ash/common/shelf/shelf_window_watcher_item_delegate.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/shelf/shelf_window_watcher_item_delegate.h"
 
 #include "ash/common/shelf/shelf_controller.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
@@ skipping 17 matching lines @@
 
 ShelfWindowWatcherItemDelegate::ShelfWindowWatcherItemDelegate(ShelfID id,
                                                                WmWindow* window)
     : id_(id), window_(window) {
   DCHECK_NE(kInvalidShelfID, id_);
   DCHECK(window_);
 }
 
 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();
 }
 
 }  // namespace ash