mash: Fold ShelfItemDelegateManager into ShelfModel

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

 // Copyright 2013 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_CHROME_LAUNCHER_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 60 matching lines @@
   // Creates a new app item on the shelf for |controller|.
   virtual ash::ShelfID CreateAppLauncherItem(LauncherItemController* controller,
                                              const std::string& app_id,
                                              ash::ShelfItemStatus status) = 0;
 
   // Updates the running status of an item. It will also update the status of
   // browsers shelf item if needed.
   virtual void SetItemStatus(ash::ShelfID id, ash::ShelfItemStatus status) = 0;
 
   // Updates the controller associated with id (which should be a shortcut).
-  // |controller| will be owned by the |ChromeLauncherController| and then
-  // passed on to |ShelfItemDelegateManager|.
+  // Takes ownership of |controller|.
   // TODO(skuhne): Pass in scoped_ptr to make ownership clear.
   virtual void SetItemController(ash::ShelfID id,
                                  LauncherItemController* controller) = 0;
 
   // Closes or unpins the shelf item.
   virtual void CloseLauncherItem(ash::ShelfID id) = 0;
 
   // Pins the specified id. Currently only supports platform apps.
   virtual void Pin(ash::ShelfID id) = 0;
 
@@ skipping 153 matching lines @@
  protected:
   ChromeLauncherController();
 
  private:
   static ChromeLauncherController* instance_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_