| 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) {
|
|
|