mash: Move LauncherItemController to ash, rename ShelfItemDelegate.

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/public/cpp/shelf_item_delegate.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
-#include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
 #include "components/favicon/content/content_favicon_driver.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/app_window/app_window_registry.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/events/event.h"
 #include "ui/gfx/image/image.h"
 #include "ui/wm/core/window_animations.h"
 
 ExtensionAppWindowLauncherItemController::
     ExtensionAppWindowLauncherItemController(
-        const ash::AppLaunchId& app_launch_id,
-        ChromeLauncherController* controller)
-    : AppWindowLauncherItemController(app_launch_id, controller) {}
+        const ash::AppLaunchId& app_launch_id)
+    : AppWindowLauncherItemController(app_launch_id) {}
 
 ExtensionAppWindowLauncherItemController::
     ~ExtensionAppWindowLauncherItemController() {}
 
 void ExtensionAppWindowLauncherItemController::AddAppWindow(
     extensions::AppWindow* app_window) {
   DCHECK(!app_window->window_type_is_panel());
   AddWindow(app_window->GetBaseWindow());
 }
 
-MenuItemList ExtensionAppWindowLauncherItemController::GetAppMenuItems(
+ash::MenuItemList ExtensionAppWindowLauncherItemController::GetAppMenuItems(
     int event_flags) {
-  MenuItemList items;
+  ash::MenuItemList items;
   extensions::AppWindowRegistry* app_window_registry =
-      extensions::AppWindowRegistry::Get(launcher_controller()->profile());
+      extensions::AppWindowRegistry::Get(
+          ChromeLauncherController::instance()->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;
@@ skipping 10 matching lines @@
       item->image = *icon.ToSkBitmap();
     items.push_back(std::move(item));
     ++window_index;
   }
   return items;
 }
 
 void ExtensionAppWindowLauncherItemController::ExecuteCommand(
     uint32_t command_id,
     int32_t event_flags) {
-  launcher_controller()->ActivateShellApp(app_id(), command_id);
+  ChromeLauncherController::instance()->ActivateShellApp(app_id(), command_id);
 }