mash: Fold ShelfItemDelegateManager into ShelfModel

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
 
 #include <list>
 #include <string>
 
 #include "base/macros.h"
 #include "base/scoped_observer.h"
 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
 #include "ui/aura/window_observer.h"
 
 namespace aura {
 class Window;
 }
 
 namespace ui {
 class BaseWindow;
 }
 
 class ChromeLauncherController;
 
 // This is a LauncherItemController for abstract app windows. There is one
 // instance per app, per launcher id. For apps with multiple windows, each item
 // controller keeps track of all windows associated with the app and their
-// activation order. Instances are owned by ash::ShelfItemDelegateManager.
+// activation order. Instances are owned by ash::ShelfModel.
 //
 // Tests are in chrome_launcher_controller_impl_browsertest.cc
 class AppWindowLauncherItemController : public LauncherItemController,
                                         public aura::WindowObserver {
  public:
   using WindowList = std::list<ui::BaseWindow*>;
 
   ~AppWindowLauncherItemController() override;
 
   void AddWindow(ui::BaseWindow* window);
@@ skipping 66 matching lines @@
   // AppLauncherItemController for each |app_shelf_id_|.
   const std::string app_shelf_id_;
 
   // Scoped list of observed windows (for removal on destruction)
   ScopedObserver<aura::Window, aura::WindowObserver> observed_windows_;
 
   DISALLOW_COPY_AND_ASSIGN(AppWindowLauncherItemController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_