Revert of mash: Remove ChromeLauncherController's |id_to_item_controller_map_|.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.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_IMPL_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_
 
 #include <list>
 #include <memory>
 
@@ skipping 49 matching lines @@
   ChromeLauncherControllerImpl(Profile* profile, ash::ShelfModel* model);
   ~ChromeLauncherControllerImpl() override;
 
   // ChromeLauncherController:
   ash::ShelfID CreateAppLauncherItem(
       std::unique_ptr<ash::ShelfItemDelegate> item_delegate,
       ash::ShelfItemStatus status) override;
   const ash::ShelfItem* GetItem(ash::ShelfID id) const override;
   void SetItemType(ash::ShelfID id, ash::ShelfItemType type) override;
   void SetItemStatus(ash::ShelfID id, ash::ShelfItemStatus status) override;
+  void SetShelfItemDelegate(
+      ash::ShelfID id,
+      std::unique_ptr<ash::ShelfItemDelegate> item_delegate) override;
   void CloseLauncherItem(ash::ShelfID id) override;
   bool IsPinned(ash::ShelfID id) override;
   void SetV1AppStatus(const std::string& app_id,
                       ash::ShelfItemStatus status) override;
   void Launch(ash::ShelfID id, int event_flags) override;
   void Close(ash::ShelfID id) override;
   bool IsOpen(ash::ShelfID id) override;
   bool IsPlatformApp(ash::ShelfID id) override;
   void ActivateApp(const std::string& app_id,
                    ash::ShelfLaunchSource source,
@@ skipping 17 matching lines @@
   void ActivateShellApp(const std::string& app_id, int window_index) override;
   bool IsWebContentHandledByApplication(content::WebContents* web_contents,
                                         const std::string& app_id) override;
   bool ContentCanBeHandledByGmailApp(
       content::WebContents* web_contents) override;
   gfx::Image GetAppListIcon(content::WebContents* web_contents) const override;
   base::string16 GetAppListTitle(
       content::WebContents* web_contents) const override;
   BrowserShortcutLauncherItemController*
   GetBrowserShortcutLauncherItemController() override;
+  ash::ShelfItemDelegate* GetShelfItemDelegate(const ash::ShelfID id) override;
   bool ShelfBoundsChangesProbablyWithUser(
       ash::WmShelf* shelf,
       const AccountId& account_id) const override;
   void OnUserProfileReadyToSwitch(Profile* profile) override;
   ArcAppDeferredLauncherController* GetArcDeferredLauncher() override;
   const std::string& GetLaunchIDForShelfID(ash::ShelfID id) override;
   void AttachProfile(Profile* profile_to_attach) override;
 
   // Access to the BrowserStatusMonitor for tests.
   BrowserStatusMonitor* browser_status_monitor_for_test() {
@@ skipping 33 matching lines @@
       const ash::AppLaunchId& app_launch_id,
       int index);
 
  private:
   friend class ChromeLauncherControllerImplTest;
   friend class ShelfAppBrowserTest;
   friend class LauncherPlatformAppBrowserTest;
   friend class TestChromeLauncherControllerImpl;
   FRIEND_TEST_ALL_PREFIXES(ChromeLauncherControllerImplTest, AppPanels);
 
+  typedef std::map<ash::ShelfID, ash::ShelfItemDelegate*> IDToItemControllerMap;
   typedef std::map<content::WebContents*, std::string> WebContentsToAppIDMap;
 
   // Remembers / restores list of running applications.
   // Note that this order will neither be stored in the preference nor will it
   // remember the order of closed applications since it is only temporary.
   void RememberUnpinnedRunningApplicationOrder();
   void RestoreUnpinnedRunningApplicationOrder(const std::string& user_id);
 
   // Invoked when the associated browser or app is closed.
-  void RemoveShelfItem(ash::ShelfID id);
+  void LauncherItemClosed(ash::ShelfID id);
 
   // Internal helpers for pinning and unpinning that handle both
   // client-triggered and internal pinning operations.
   void DoPinAppWithID(const std::string& app_id);
   void DoUnpinAppWithID(const std::string& app_id, bool update_prefs);
 
   // Pin a running app with |shelf_id| internally to |index|.
   void PinRunningAppInternal(int index, ash::ShelfID shelf_id);
 
   // Unpin a locked application. This is an internal call which converts the
@@ skipping 45 matching lines @@
                                              const Profile* profile);
 
   // Forget the current profile to allow attaching to a new one.
   void ReleaseProfile();
 
   // ash::ShelfModelObserver:
   void ShelfItemAdded(int index) override;
   void ShelfItemRemoved(int index, const ash::ShelfItem& old_item) override;
   void ShelfItemMoved(int start_index, int target_index) override;
   void ShelfItemChanged(int index, const ash::ShelfItem& old_item) override;
+  void OnSetShelfItemDelegate(ash::ShelfID id,
+                              ash::ShelfItemDelegate* item_delegate) override;
 
   // ash::WindowTreeHostManager::Observer:
   void OnDisplayConfigurationChanged() override;
 
   // AppSyncUIStateObserver:
   void OnAppSyncUIStatusChanged() override;
 
   // AppIconLoaderDelegate:
   void OnAppImageUpdated(const std::string& app_id,
                          const gfx::ImageSkia& image) override;
 
   // app_list::AppListSyncableService::Observer:
   void OnSyncModelUpdated() override;
 
   // sync_preferences::PrefServiceSyncableObserver:
   void OnIsSyncingChanged() override;
 
   // An internal helper to unpin a shelf item; this does not update prefs.
   void UnpinShelfItemInternal(ash::ShelfID id);
 
   ash::ShelfModel* model_;
 
+  // Controller items in this map are owned by |ShelfModel|.
+  IDToItemControllerMap id_to_item_controller_map_;
+
   // Direct access to app_id for a web contents.
   WebContentsToAppIDMap web_contents_to_app_id_;
 
   // Used to track app windows.
   std::vector<std::unique_ptr<AppWindowLauncherController>>
       app_window_controllers_;
 
   // Used to handle app load/unload events.
   std::vector<std::unique_ptr<LauncherAppUpdater>> app_updaters_;
 
@@ skipping 17 matching lines @@
   typedef std::vector<std::string> RunningAppListIds;
   typedef std::map<std::string, RunningAppListIds> RunningAppListIdMap;
   RunningAppListIdMap last_used_running_application_order_;
 
   base::WeakPtrFactory<ChromeLauncherControllerImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerImpl);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_