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

Unified Diff: chrome/browser/content_settings/content_settings_pref_provider.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
Index: chrome/browser/content_settings/content_settings_pref_provider.cc
diff --git a/chrome/browser/content_settings/content_settings_pref_provider.cc b/chrome/browser/content_settings/content_settings_pref_provider.cc
index 8b4887e7e0bf371a1780e9350539499918e35ac0..e5ad337a5d9d2231b5dce62913b37d961433a93c 100644
--- a/chrome/browser/content_settings/content_settings_pref_provider.cc
+++ b/chrome/browser/content_settings/content_settings_pref_provider.cc
@@ -217,15 +217,11 @@ void PrefProvider::ClearAllContentSettingsRules(
std::string());
}
-void PrefProvider::Observe(
- int type,
- const content::NotificationSource& source,
- const content::NotificationDetails& details) {
+void PrefProvider::OnPreferenceChanged(PrefServiceBase* service,
+ const std::string& name) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- DCHECK_EQ(chrome::NOTIFICATION_PREF_CHANGED, type);
- DCHECK_EQ(content::Source<PrefService>(source).ptr(), prefs_);
- DCHECK_EQ(std::string(prefs::kContentSettingsPatternPairs),
- *content::Details<std::string>(details).ptr());
+ DCHECK_EQ(prefs_, service);
+ DCHECK_EQ(std::string(prefs::kContentSettingsPatternPairs), name);
if (updating_preferences_)
return;

Powered by Google App Engine
This is Rietveld 408576698