mash: Move LauncherItemController to ash, rename ShelfItemDelegate.

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

 // Copyright 2014 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/app_window_launcher_item_controller.h"
 
 #include <algorithm>
 
 #include "ash/wm/window_util.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/base/base_window.h"
 #include "ui/wm/core/window_animations.h"
 
 AppWindowLauncherItemController::AppWindowLauncherItemController(
-    const ash::AppLaunchId& app_launch_id,
-    ChromeLauncherController* controller)
-    : LauncherItemController(app_launch_id, controller),
-      observed_windows_(this) {}
+    const ash::AppLaunchId& app_launch_id)
+    : ash::ShelfItemDelegate(app_launch_id), observed_windows_(this) {}
 
 AppWindowLauncherItemController::~AppWindowLauncherItemController() {}
 
 void AppWindowLauncherItemController::AddWindow(ui::BaseWindow* app_window) {
   windows_.push_front(app_window);
   aura::Window* window = app_window->GetNativeWindow();
   if (window)
     observed_windows_.Add(window);
 }
 
@@ skipping 92 matching lines @@
     intptr_t old) {
   if (key == aura::client::kDrawAttentionKey) {
     ash::ShelfItemStatus status;
     if (ash::wm::IsActiveWindow(window)) {
       status = ash::STATUS_ACTIVE;
     } else if (window->GetProperty(aura::client::kDrawAttentionKey)) {
       status = ash::STATUS_ATTENTION;
     } else {
       status = ash::STATUS_RUNNING;
     }
-    launcher_controller()->SetItemStatus(shelf_id(), status);
+    ChromeLauncherController::instance()->SetItemStatus(shelf_id(), status);
   }
 }
 
 ash::ShelfAction AppWindowLauncherItemController::ShowAndActivateOrMinimize(
     ui::BaseWindow* app_window) {
   // Either show or minimize windows when shown from the launcher.
-  return launcher_controller()->ActivateWindowOrMinimizeIfActive(
+  return ChromeLauncherController::instance()->ActivateWindowOrMinimizeIfActive(
       app_window, GetAppMenuItems(ui::EF_NONE).size() == 1);
 }
 
 ash::ShelfAction
 AppWindowLauncherItemController::ActivateOrAdvanceToNextAppWindow(
     ui::BaseWindow* window_to_show) {
   WindowList::iterator i(
       std::find(windows_.begin(), windows_.end(), window_to_show));
   if (i != windows_.end()) {
     if (++i != windows_.end())
       window_to_show = *i;
     else
       window_to_show = windows_.front();
   }
   if (window_to_show->IsActive()) {
     // Coming here, only a single window is active. For keyboard activations
     // the window gets animated.
     AnimateWindow(window_to_show->GetNativeWindow(),
                   wm::WINDOW_ANIMATION_TYPE_BOUNCE);
   } else {
     return ShowAndActivateOrMinimize(window_to_show);
   }
   return ash::SHELF_ACTION_NONE;
 }