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

ash/common/shelf/wm_shelf.cc

 // Copyright 2016 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/wm_shelf.h"
 
 #include "ash/common/shelf/shelf_controller.h"
 #include "ash/common/shelf/shelf_delegate.h"
-#include "ash/common/shelf/shelf_item_delegate.h"
 #include "ash/common/shelf/shelf_layout_manager.h"
 #include "ash/common/shelf/shelf_locking_manager.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/shelf/shelf_widget.h"
 #include "ash/common/shelf/wm_shelf_observer.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
+#include "ash/public/interfaces/shelf.mojom.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_bezel_event_handler.h"
 #include "ash/shell.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "ui/aura/env.h"
 #include "ui/display/types/display_constants.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace ash {
 
+namespace {
+
+// A callback that does nothing after shelf item selection handling.
+void NoopCallback(ShelfAction, std::vector<mojom::MenuItemPtr>) {}

[James Cook, 2017/03/10 16:56:01]

btw, I like how you leave out the argument names on functions like this.

[msw, 2017/03/10 20:44:45]

Acknowledged.

+
+}  // namespace
+
 // WmShelf::AutoHideEventHandler -----------------------------------------------
 
 // Forwards mouse and gesture events to ShelfLayoutManager for auto-hide.
 // TODO(mash): Add similar event handling support for mash.
 class WmShelf::AutoHideEventHandler : public ui::EventHandler {
  public:
   explicit AutoHideEventHandler(ShelfLayoutManager* shelf_layout_manager)
       : shelf_layout_manager_(shelf_layout_manager) {
     Shell::GetInstance()->AddPreTargetHandler(this);
   }
@@ skipping 244 matching lines @@
   if (found_index >= 0 && (indexes_left == -1 || item_index < 0)) {
     // Then set this one as active (or advance to the next item of its kind).
     ActivateShelfItem(found_index);
   }
 }
 
 // static
 void WmShelf::ActivateShelfItem(int item_index) {
   ShelfModel* shelf_model = WmShell::Get()->shelf_model();
   const ShelfItem& item = shelf_model->items()[item_index];
-  ShelfItemDelegate* item_delegate = shelf_model->GetShelfItemDelegate(item.id);
-  item_delegate->ItemSelected(ui::ET_KEY_RELEASED, ui::EF_NONE,
-                              display::kInvalidDisplayId, LAUNCH_FROM_UNKNOWN);
+  mojom::ShelfItemDelegate* item_delegate =
+      shelf_model->GetShelfItemDelegate(item.id);
+  std::unique_ptr<ui::Event> event = base::MakeUnique<ui::KeyEvent>(
+      ui::ET_KEY_RELEASED, ui::VKEY_UNKNOWN, ui::EF_NONE);
+  item_delegate->ItemSelected(std::move(event), display::kInvalidDisplayId,
+                              LAUNCH_FROM_UNKNOWN, base::Bind(&NoopCallback));
 }
 
 bool WmShelf::ProcessGestureEvent(const ui::GestureEvent& event) {
   // Can be called at login screen.
   if (!shelf_layout_manager_)
     return false;
   return shelf_layout_manager_->ProcessGestureEvent(event);
 }
 
 void WmShelf::AddObserver(WmShelfObserver* observer) {
@@ skipping 59 matching lines @@
 
 void WmShelf::OnBackgroundUpdated(ShelfBackgroundType background_type,
                                   AnimationChangeType change_type) {
   if (background_type == GetBackgroundType())
     return;
   for (auto& observer : observers_)
     observer.OnBackgroundTypeChanged(background_type, change_type);
 }
 
 }  // namespace ash