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

Unified Diff: chrome/browser/content_settings/content_settings_default_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_default_provider.cc
diff --git a/chrome/browser/content_settings/content_settings_default_provider.cc b/chrome/browser/content_settings/content_settings_default_provider.cc
index 97e6b55256c9d0db59fb41c3148cfd5403b6b107..ca56f7adf81ea9579d5ebf86b9a1d6de6f80062a 100644
--- a/chrome/browser/content_settings/content_settings_default_provider.cc
+++ b/chrome/browser/content_settings/content_settings_default_provider.cc
@@ -276,17 +276,13 @@ void DefaultProvider::ShutdownOnUIThread() {
prefs_ = NULL;
}
-void DefaultProvider::Observe(int type,
- const content::NotificationSource& source,
- const content::NotificationDetails& details) {
+void DefaultProvider::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(prefs_, service);
if (updating_preferences_)
return;
- const std::string& name = *content::Details<std::string>(details).ptr();
if (name == prefs::kDefaultContentSettings) {
ReadDefaultSettings(true);
} else if (name == prefs::kGeolocationDefaultContentSetting) {

Powered by Google App Engine
This is Rietveld 408576698