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

chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 552 matching lines @@
       ash::MultiProfileUMA::RecordTeleportAction(
           ash::MultiProfileUMA::TELEPORT_WINDOW_RETURN_BY_LAUNCHER);
       manager->ShowWindowForUser(native_window, current_account_id);
       window->Activate();
       return ash::SHELF_ACTION_WINDOW_ACTIVATED;
     }
   }
 
   if (window->IsActive() && allow_minimize) {
     window->Minimize();
-    return ash::SHELF_ACTION_NONE;
+    return ash::SHELF_ACTION_WINDOW_MINIMIZED;

[James Cook, 2017/03/09 01:09:47]

Weird that it was NONE before. Was that a bug?

[msw, 2017/03/10 06:17:57]

Yeah, it seems so... the difference between these values only would have had an
effect on UMA, not the resulting behavior, afaict.

   }
 
   window->Show();
   window->Activate();
   return ash::SHELF_ACTION_WINDOW_ACTIVATED;
 }
 
 void ChromeLauncherControllerImpl::ActiveUserChanged(
     const std::string& user_email) {
   // Store the order of running applications for the user which gets inactive.
@@ skipping 24 matching lines @@
     ash::Shell::GetInstance()->CreateKeyboard();
 }
 
 void ChromeLauncherControllerImpl::AdditionalUserAddedToSession(
     Profile* profile) {
   // Switch the running applications to the new user.
   for (auto& controller : app_window_controllers_)
     controller->AdditionalUserAddedToSession(profile);
 }
 
-ash::ShelfAppMenuItemList
+ash::ShelfItemDelegate::MenuItemList
 ChromeLauncherControllerImpl::GetAppMenuItemsForTesting(
     const ash::ShelfItem& item) {
   LauncherItemController* controller = GetLauncherItemController(item.id);
   return controller ? controller->GetAppMenuItems(ui::EF_NONE)
-                    : ash::ShelfAppMenuItemList();
+                    : ash::ShelfItemDelegate::MenuItemList();
 }
 
 std::vector<content::WebContents*>
 ChromeLauncherControllerImpl::GetV1ApplicationsFromAppId(
     const std::string& app_id) {
   const ash::ShelfItem* item = GetItem(GetShelfIDForAppID(app_id));
   // If there is no such item pinned to the launcher, no menu gets created.
   if (!item || item->type != ash::TYPE_APP_SHORTCUT)
     return std::vector<content::WebContents*>();
   LauncherItemController* controller = GetLauncherItemController(item->id);
@@ skipping 856 matching lines @@
     LauncherItemController* controller = GetLauncherItemController(item.id);
     if (!controller || controller->image_set_by_controller())
       continue;
     item.image = image;
     if (arc_deferred_launcher_)
       arc_deferred_launcher_->MaybeApplySpinningEffect(id, &item.image);
     model_->Set(index, item);
     // It's possible we're waiting on more than one item, so don't break.
   }
 }