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

Unified Diff: chrome/browser/sync/sync_prefs.cc

Issue 11345008: Remove content::NotificationObserver dependency from most Prefs code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head for commit Created 8 years, 1 month 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
« no previous file with comments | « chrome/browser/sync/sync_prefs.h ('k') | chrome/browser/translate/translate_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/sync_prefs.cc
diff --git a/chrome/browser/sync/sync_prefs.cc b/chrome/browser/sync/sync_prefs.cc
index ee9380c513e26f403118ed6e248a58f97282992d..c483966bc692fe44abaaefa93f5a25e9ec33ac73 100644
--- a/chrome/browser/sync/sync_prefs.cc
+++ b/chrome/browser/sync/sync_prefs.cc
@@ -263,24 +263,13 @@ void SyncPrefs::AcknowledgeSyncedTypes(syncer::ModelTypeSet types) {
pref_service_->Set(prefs::kSyncAcknowledgedSyncTypes, *value);
}
-void SyncPrefs::Observe(int type,
- const content::NotificationSource& source,
- const content::NotificationDetails& details) {
+void SyncPrefs::OnPreferenceChanged(PrefServiceBase* service,
+ const std::string& pref_name) {
DCHECK(CalledOnValidThread());
- DCHECK(content::Source<PrefService>(pref_service_) == source);
- switch (type) {
- case chrome::NOTIFICATION_PREF_CHANGED: {
- const std::string* pref_name =
- content::Details<const std::string>(details).ptr();
- if (*pref_name == prefs::kSyncManaged) {
- FOR_EACH_OBSERVER(SyncPrefObserver, sync_pref_observers_,
- OnSyncManagedPrefChange(*pref_sync_managed_));
- }
- break;
- }
- default:
- NOTREACHED();
- break;
+ DCHECK_EQ(pref_service_, service);
+ if (pref_name == prefs::kSyncManaged) {
+ FOR_EACH_OBSERVER(SyncPrefObserver, sync_pref_observers_,
+ OnSyncManagedPrefChange(*pref_sync_managed_));
}
}
« no previous file with comments | « chrome/browser/sync/sync_prefs.h ('k') | chrome/browser/translate/translate_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698