Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(492)

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h

Issue 2771663002: mash: Refactor ChromeLauncherController's ShelfDelegate code. (Closed)
Patch Set: Revise uma logic; make TestShelfDelegate set [un]pinned item types. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
index 6c032f9623871a01c1056e2ef35cf0705f444c7f..cfdc39664c96d6fb66381c51e16b9868ca8dcd6f 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
@@ -69,10 +69,7 @@ class ChromeLauncherControllerImpl
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;
@@ -133,7 +130,6 @@ class ChromeLauncherControllerImpl
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;
@@ -271,9 +267,8 @@ class ChromeLauncherControllerImpl
// 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_;

Powered by Google App Engine
This is Rietveld 408576698