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

chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.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 "chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.h"
 
 #include "ash/common/wm/window_state.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/memory/ptr_util.h"
@@ skipping 21 matching lines @@
 
 ExtensionAppWindowLauncherItemController::
     ~ExtensionAppWindowLauncherItemController() {}
 
 void ExtensionAppWindowLauncherItemController::AddAppWindow(
     extensions::AppWindow* app_window) {
   DCHECK(!app_window->window_type_is_panel());
   AddWindow(app_window->GetBaseWindow());
 }
 
-ash::ShelfAppMenuItemList
+ash::ShelfItemDelegate::MenuItemList
 ExtensionAppWindowLauncherItemController::GetAppMenuItems(int event_flags) {
-  ash::ShelfAppMenuItemList items;
+  ash::ShelfItemDelegate::MenuItemList items;
   extensions::AppWindowRegistry* app_window_registry =
       extensions::AppWindowRegistry::Get(launcher_controller()->profile());
 
   uint32_t window_index = 0;
   for (const ui::BaseWindow* window : windows()) {
     extensions::AppWindow* app_window =
         app_window_registry->GetAppWindowForNativeWindow(
             window->GetNativeWindow());
     DCHECK(app_window);
 
+    ash::mojom::MenuItemPtr item(ash::mojom::MenuItem::New());
+    item->command_id = window_index;
+    item->label = app_window->GetTitle();
+
     // Use the app's web contents favicon, or the app window's icon.
     favicon::FaviconDriver* favicon_driver =
         favicon::ContentFaviconDriver::FromWebContents(
             app_window->web_contents());
     gfx::Image icon = favicon_driver->GetFavicon();
     if (icon.IsEmpty())
       icon = app_window->app_icon();
-
-    items.push_back(base::MakeUnique<ash::ShelfApplicationMenuItem>(
-        window_index, app_window->GetTitle(), &icon));
+    if (!icon.IsEmpty())
+      item->image = *icon.ToSkBitmap();
+    items.push_back(std::move(item));
     ++window_index;
   }
   return items;
 }
 
 void ExtensionAppWindowLauncherItemController::ExecuteCommand(
     uint32_t command_id,
-    int event_flags) {
+    int32_t event_flags) {
   launcher_controller()->ActivateShellApp(app_id(), command_id);
 }