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

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

Issue 2655553002: [Merge M57] Fix import legacy, pref based pins. (Closed)
Patch Set: Created 3 years, 11 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 5e232c9a3cb51461a282c0a9bc9b657bdb32c450..840101197e0dca2fecb91649d6decf5cf5ebbc01 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
@@ -22,6 +22,7 @@
#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
#include "chrome/browser/ui/ash/launcher/launcher_app_updater.h"
#include "components/prefs/pref_change_registrar.h"
+#include "components/sync_preferences/pref_service_syncable_observer.h"
#include "ui/aura/window_observer.h"
class AppSyncUIState;
@@ -53,7 +54,8 @@ class ChromeLauncherControllerImpl
private ash::ShelfModelObserver,
private ash::WindowTreeHostManager::Observer,
private AppSyncUIStateObserver,
- private app_list::AppListSyncableService::Observer {
+ private app_list::AppListSyncableService::Observer,
+ private sync_preferences::PrefServiceSyncableObserver {
public:
ChromeLauncherControllerImpl(Profile* profile, ash::ShelfModel* model);
~ChromeLauncherControllerImpl() override;
@@ -265,6 +267,9 @@ class ChromeLauncherControllerImpl
// 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);
« no previous file with comments | « chrome/browser/ui/ash/chrome_launcher_prefs.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698