mash: Move LauncherItemController to ash, rename ShelfItemDelegate.

chrome/browser/ui/ash/launcher/extension_app_window_launcher_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_controller.h"
 
 #include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/wm_window.h"
 #include "ash/shell.h"
 #include "ash/wm/window_properties.h"
@@ skipping 148 matching lines @@
   ash::ShelfID shelf_id = 0;
 
   if (app_controller_iter != app_controller_map_.end()) {
     ExtensionAppWindowLauncherItemController* controller =
         app_controller_iter->second;
     DCHECK(controller->app_id() == app_id);
     shelf_id = controller->shelf_id();
     controller->AddAppWindow(app_window);
   } else {
     std::string launch_id = GetLaunchId(app_window);
-    ExtensionAppWindowLauncherItemController* controller =
-        new ExtensionAppWindowLauncherItemController(
-            ash::AppLaunchId(app_id, launch_id), owner());
+    std::unique_ptr<ExtensionAppWindowLauncherItemController> controller =
+        base::MakeUnique<ExtensionAppWindowLauncherItemController>(
+            ash::AppLaunchId(app_id, launch_id));
+    ExtensionAppWindowLauncherItemController* item_controller =
+        controller.get();
+
     controller->AddAppWindow(app_window);
     // If there is already a shelf id mapped to this AppLaunchId (e.g. pinned),
     // use that shelf item.
     shelf_id =
         ash::Shell::Get()->shelf_delegate()->GetShelfIDForAppIDAndLaunchID(
             app_id, launch_id);
 
     if (shelf_id == 0) {
-      shelf_id = owner()->CreateAppLauncherItem(controller, status);
+      shelf_id = owner()->CreateAppLauncherItem(std::move(controller), status);
       // Restore any existing app icon and flag as set.
       const gfx::Image& app_icon = app_window->app_icon();
       if (!app_icon.IsEmpty()) {
         owner()->SetLauncherItemImage(shelf_id, app_icon.AsImageSkia());
-        controller->set_image_set_by_controller(true);
+        item_controller->set_image_set_by_controller(true);
       }
     } else {
-      owner()->SetItemController(shelf_id, controller);
+      owner()->SetShelfItemDelegate(shelf_id, std::move(controller));
     }
 
     // We need to change the controller associated with app_shelf_id.
-    app_controller_map_[app_shelf_id] = controller;
+    app_controller_map_[app_shelf_id] = item_controller;
   }
   owner()->SetItemStatus(shelf_id, status);
   ash::WmWindow::Get(window)->aura_window()->SetProperty(ash::kShelfIDKey,
                                                          shelf_id);
 }
 
 void ExtensionAppWindowLauncherController::UnregisterApp(aura::Window* window) {
   WindowToAppShelfIdMap::iterator window_iter =
       window_to_app_shelf_id_map_.find(window);
   DCHECK(window_iter != window_to_app_shelf_id_map_.end());
@@ skipping 31 matching lines @@
   WindowToAppShelfIdMap::iterator window_iter =
       window_to_app_shelf_id_map_.find(window);
   if (window_iter == window_to_app_shelf_id_map_.end())
     return nullptr;
   AppControllerMap::iterator app_controller_iter =
       app_controller_map_.find(window_iter->second);
   if (app_controller_iter == app_controller_map_.end())
     return nullptr;
   return app_controller_iter->second;
 }