mash: Move LauncherItemController to ash, rename ShelfItemDelegate.

chrome/browser/ui/ash/launcher/arc_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/arc_app_window_launcher_item_controller.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h"
 #include "ui/aura/window.h"
 #include "ui/base/base_window.h"
 
 ArcAppWindowLauncherItemController::ArcAppWindowLauncherItemController(
-    const std::string& arc_app_id,
-    ChromeLauncherController* controller)
-    : AppWindowLauncherItemController(ash::AppLaunchId(arc_app_id),
-                                      controller) {}
+    const std::string& arc_app_id)
+    : AppWindowLauncherItemController(ash::AppLaunchId(arc_app_id)) {}
 
 ArcAppWindowLauncherItemController::~ArcAppWindowLauncherItemController() {}
 
 void ArcAppWindowLauncherItemController::AddTaskId(int task_id) {
   task_ids_.insert(task_id);
 }
 
 void ArcAppWindowLauncherItemController::RemoveTaskId(int task_id) {
   task_ids_.erase(task_id);
 }
@@ skipping 20 matching lines @@
   }
   arc::SetTaskActive(*task_ids_.begin());
   callback.Run(ash::SHELF_ACTION_NEW_WINDOW_CREATED, base::nullopt);
 }
 
 void ArcAppWindowLauncherItemController::ExecuteCommand(uint32_t command_id,
                                                         int32_t event_flags) {
   ActivateIndexedApp(command_id);
 }
 
-MenuItemList ArcAppWindowLauncherItemController::GetAppMenuItems(
+ash::MenuItemList ArcAppWindowLauncherItemController::GetAppMenuItems(
     int event_flags) {
-  MenuItemList items;
+  ash::MenuItemList items;
   base::string16 app_title = LauncherControllerHelper::GetAppTitle(
-      launcher_controller()->profile(), app_id());
+      ChromeLauncherController::instance()->profile(), app_id());
   for (auto it = windows().begin(); it != windows().end(); ++it) {
     // TODO(khmel): resolve correct icon here.
     size_t i = std::distance(windows().begin(), it);
     aura::Window* window = (*it)->GetNativeWindow();
     ash::mojom::MenuItemPtr item = ash::mojom::MenuItem::New();
     item->command_id = base::checked_cast<uint32_t>(i);
     item->label = (window && !window->GetTitle().empty()) ? window->GetTitle()
                                                           : app_title;
     items.push_back(std::move(item));
   }
   return items;
 }