mash: Move LauncherItemController to ash, rename ShelfItemDelegate.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.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/chrome_launcher_controller_mus.h"
 
 #include "ash/public/cpp/app_launch_id.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 #include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h"
 #include "extensions/grit/extensions_browser_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/event_constants.h"
 
 ChromeLauncherControllerMus::ChromeLauncherControllerMus() {
   AttachProfile(ProfileManager::GetActiveUserProfile());
 }
 
 ChromeLauncherControllerMus::~ChromeLauncherControllerMus() {}
 
 ash::ShelfID ChromeLauncherControllerMus::CreateAppLauncherItem(
-    LauncherItemController* controller,
+    std::unique_ptr<ash::ShelfItemDelegate> item_delegate,
     ash::ShelfItemStatus status) {
   NOTIMPLEMENTED();
   return ash::TYPE_UNDEFINED;
 }
 
 const ash::ShelfItem* ChromeLauncherControllerMus::GetItem(
     ash::ShelfID id) const {
   NOTIMPLEMENTED();
   return nullptr;
 }
 
 void ChromeLauncherControllerMus::SetItemType(ash::ShelfID id,
                                               ash::ShelfItemType type) {
   NOTIMPLEMENTED();
 }
 
 void ChromeLauncherControllerMus::SetItemStatus(ash::ShelfID id,
                                                 ash::ShelfItemStatus status) {
   NOTIMPLEMENTED();
 }
 
-void ChromeLauncherControllerMus::SetItemController(
+void ChromeLauncherControllerMus::SetShelfItemDelegate(
     ash::ShelfID id,
-    LauncherItemController* controller) {
+    std::unique_ptr<ash::ShelfItemDelegate> item_delegate) {
   NOTIMPLEMENTED();
 }
 
 void ChromeLauncherControllerMus::CloseLauncherItem(ash::ShelfID id) {
   NOTIMPLEMENTED();
 }
 
 bool ChromeLauncherControllerMus::IsPinned(ash::ShelfID id) {
   NOTIMPLEMENTED();
   return false;
@@ skipping 60 matching lines @@
 void ChromeLauncherControllerMus::ActiveUserChanged(
     const std::string& user_email) {
   NOTIMPLEMENTED();
 }
 
 void ChromeLauncherControllerMus::AdditionalUserAddedToSession(
     Profile* profile) {
   NOTIMPLEMENTED();
 }
 
-MenuItemList ChromeLauncherControllerMus::GetAppMenuItemsForTesting(
+ash::MenuItemList ChromeLauncherControllerMus::GetAppMenuItemsForTesting(
     const ash::ShelfItem& item) {
   NOTIMPLEMENTED();
-  return MenuItemList();
+  return ash::MenuItemList();
 }
 
 std::vector<content::WebContents*>
 ChromeLauncherControllerMus::GetV1ApplicationsFromAppId(
     const std::string& app_id) {
   NOTIMPLEMENTED();
   return std::vector<content::WebContents*>();
 }
 
 void ChromeLauncherControllerMus::ActivateShellApp(const std::string& app_id,
@@ skipping 25 matching lines @@
   NOTIMPLEMENTED();
   return base::string16();
 }
 
 BrowserShortcutLauncherItemController*
 ChromeLauncherControllerMus::GetBrowserShortcutLauncherItemController() {
   NOTIMPLEMENTED();
   return nullptr;
 }
 
-LauncherItemController* ChromeLauncherControllerMus::GetLauncherItemController(
+ash::ShelfItemDelegate* ChromeLauncherControllerMus::GetShelfItemDelegate(
     const ash::ShelfID id) {
   NOTIMPLEMENTED();
   return nullptr;
 }
 
 bool ChromeLauncherControllerMus::ShelfBoundsChangesProbablyWithUser(
     ash::WmShelf* shelf,
     const AccountId& account_id) const {
   NOTIMPLEMENTED();
   return false;
@@ skipping 45 matching lines @@
     item->image = *image.ToSkBitmap();
     // TOOD(msw): Actually pin the item and install its delegate; this code is
     // unused at the moment. See http://crbug.com/647879
     AppIconLoader* app_icon_loader = GetAppIconLoaderForApp(app_id);
     if (app_icon_loader) {
       app_icon_loader->FetchImage(app_id);
       app_icon_loader->UpdateImage(app_id);
     }
   }
 }