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

chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc

 // Copyright 2014 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 "chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h"
 
 #include <algorithm>
 
 #include "ash/wm/window_util.h"
 #include "base/memory/ptr_util.h"
@@ skipping 56 matching lines @@
   ui::BaseWindow* app_window = GetAppWindow(window);
   if (app_window)
     last_active_window_ = app_window;
 }
 
 AppWindowLauncherItemController*
 AppWindowLauncherItemController::AsAppWindowLauncherItemController() {
   return this;
 }
 
-ash::ShelfAction AppWindowLauncherItemController::ItemSelected(
-    ui::EventType event_type,
-    int event_flags,
+void AppWindowLauncherItemController::ItemSelected(
+    std::unique_ptr<ui::Event> event,
     int64_t display_id,
-    ash::ShelfLaunchSource source) {
-  if (windows_.empty())
-    return ash::SHELF_ACTION_NONE;
+    ash::ShelfLaunchSource source,
+    const ItemSelectedCallback& callback) {
+  if (windows_.empty()) {
+    callback.Run(ash::SHELF_ACTION_NONE,
+                 std::vector<ash::mojom::MenuItemPtr>());
+    return;
+  }
 
   ui::BaseWindow* window_to_show =
       last_active_window_ ? last_active_window_ : windows_.front();
   // If the event was triggered by a keystroke, we try to advance to the next
   // item if the window we are trying to activate is already active.
-  if (windows_.size() >= 1 && window_to_show->IsActive() &&
-      event_type == ui::ET_KEY_RELEASED) {
-    return ActivateOrAdvanceToNextAppWindow(window_to_show);
+  ash::ShelfAction action = ash::SHELF_ACTION_NONE;
+  if (windows_.size() >= 1 && window_to_show->IsActive() && event &&
+      event->type() == ui::ET_KEY_RELEASED) {
+    action = ActivateOrAdvanceToNextAppWindow(window_to_show);
+  } else {
+    action = ShowAndActivateOrMinimize(window_to_show);
   }
 
-  return ShowAndActivateOrMinimize(window_to_show);
-}
-
-ash::ShelfAppMenuItemList AppWindowLauncherItemController::GetAppMenuItems(
-    int event_flags) {
-  // Return an empty item list to avoid showing an application menu.
-  return ash::ShelfAppMenuItemList();
+  callback.Run(action, GetAppMenuItems(event ? event->flags() : ui::EF_NONE));
 }
 
 void AppWindowLauncherItemController::ExecuteCommand(uint32_t command_id,
-                                                     int event_flags) {
+                                                     int32_t event_flags) {
   // This delegate does not support showing an application menu.
   NOTIMPLEMENTED();
 }
 
 void AppWindowLauncherItemController::Close() {
   // Note: Closing windows may affect the contents of app_windows_.
   WindowList windows_to_close = windows_;
   for (auto* window : windows_)
     window->Close();
 }
@@ skipping 20 matching lines @@
       status = ash::STATUS_RUNNING;
     }
     launcher_controller()->SetItemStatus(shelf_id(), status);
   }
 }
 
 ash::ShelfAction AppWindowLauncherItemController::ShowAndActivateOrMinimize(
     ui::BaseWindow* app_window) {
   // Either show or minimize windows when shown from the launcher.
   return launcher_controller()->ActivateWindowOrMinimizeIfActive(
-      app_window, GetAppMenuItems(0).size() == 1);
+      app_window, GetAppMenuItems(ui::EF_NONE).size() == 1);
 }
 
 ash::ShelfAction
 AppWindowLauncherItemController::ActivateOrAdvanceToNextAppWindow(
     ui::BaseWindow* window_to_show) {
   WindowList::iterator i(
       std::find(windows_.begin(), windows_.end(), window_to_show));
   if (i != windows_.end()) {
     if (++i != windows_.end())
       window_to_show = *i;
     else
       window_to_show = windows_.front();
   }
   if (window_to_show->IsActive()) {
     // Coming here, only a single window is active. For keyboard activations
     // the window gets animated.
     AnimateWindow(window_to_show->GetNativeWindow(),
                   wm::WINDOW_ANIMATION_TYPE_BOUNCE);
   } else {
     return ShowAndActivateOrMinimize(window_to_show);
   }
   return ash::SHELF_ACTION_NONE;
 }