mash: Refactor ChromeLauncherController's ShelfDelegate code.

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 51 matching lines @@
 
   // ChromeLauncherController:
   ash::ShelfID CreateAppLauncherItem(LauncherItemController* controller,
                                      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 SetItemController(ash::ShelfID id,
                          LauncherItemController* controller) override;
   void CloseLauncherItem(ash::ShelfID id) override;
-  void Pin(ash::ShelfID id) override;
-  void Unpin(ash::ShelfID id) override;
   bool IsPinned(ash::ShelfID id) override;
-  void TogglePinned(ash::ShelfID id) override;
   void LockV1AppWithID(const std::string& app_id) override;
   void UnlockV1AppWithID(const std::string& app_id) 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,
                    int event_flags) override;
   void SetLauncherItemImage(ash::ShelfID shelf_id,
@@ skipping 40 matching lines @@
   const std::vector<std::unique_ptr<AppWindowLauncherController>>&
   app_window_controllers_for_test() {
     return app_window_controllers_;
   }
 
   // ash::ShelfDelegate:
   ash::ShelfID GetShelfIDForAppID(const std::string& app_id) override;
   ash::ShelfID GetShelfIDForAppIDAndLaunchID(
       const std::string& app_id,
       const std::string& launch_id) override;
-  bool HasShelfIDToAppIDMapping(ash::ShelfID id) const override;
   const std::string& GetAppIDForShelfID(ash::ShelfID id) override;
   void PinAppWithID(const std::string& app_id) override;
   bool IsAppPinned(const std::string& app_id) override;
   void UnpinAppWithID(const std::string& app_id) override;
 
   // LauncherAppUpdater::Delegate:
   void OnAppInstalled(content::BrowserContext* browser_context,
                       const std::string& app_id) override;
   void OnAppUpdated(content::BrowserContext* browser_context,
                     const std::string& app_id) override;
@@ skipping 117 matching lines @@
   // 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;
 
-  // Unpins shelf item and optionally updates pin prefs when |update_prefs| is
-  // set to true.
-  void UnpinAndUpdatePrefs(ash::ShelfID id, bool update_prefs);
+  // 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.
@@ skipping 26 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_