mash: Move LauncherItemController to ash, rename ShelfItemDelegate.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc
index 975c4704d9a45783ad8fd40741a8f8df4b4513cd..69a4eb6b0ecf6d94b0446dac796f388afa4a7466 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc
@@ -21,7 +21,7 @@ ChromeLauncherControllerMus::ChromeLauncherControllerMus() {
 ChromeLauncherControllerMus::~ChromeLauncherControllerMus() {}
 
 ash::ShelfID ChromeLauncherControllerMus::CreateAppLauncherItem(
-    LauncherItemController* controller,
+    ash::ShelfItemDelegate* controller,
     ash::ShelfItemStatus status) {
   NOTIMPLEMENTED();
   return ash::TYPE_UNDEFINED;
@@ -45,7 +45,7 @@ void ChromeLauncherControllerMus::SetItemStatus(ash::ShelfID id,
 
 void ChromeLauncherControllerMus::SetItemController(
     ash::ShelfID id,
-    LauncherItemController* controller) {
+    ash::ShelfItemDelegate* controller) {
   NOTIMPLEMENTED();
 }
 
@@ -126,10 +126,10 @@ void ChromeLauncherControllerMus::AdditionalUserAddedToSession(
   NOTIMPLEMENTED();
 }
 
-MenuItemList ChromeLauncherControllerMus::GetAppMenuItemsForTesting(
+ash::MenuItemList ChromeLauncherControllerMus::GetAppMenuItemsForTesting(
     const ash::ShelfItem& item) {
   NOTIMPLEMENTED();
-  return MenuItemList();
+  return ash::MenuItemList();
 }
 
 std::vector<content::WebContents*>
@@ -175,7 +175,7 @@ ChromeLauncherControllerMus::GetBrowserShortcutLauncherItemController() {
   return nullptr;
 }
 
-LauncherItemController* ChromeLauncherControllerMus::GetLauncherItemController(
+ash::ShelfItemDelegate* ChromeLauncherControllerMus::GetLauncherItemController(
     const ash::ShelfID id) {
   NOTIMPLEMENTED();
   return nullptr;