| Index: chrome/browser/content_settings/cookie_settings.cc
|
| diff --git a/chrome/browser/content_settings/cookie_settings.cc b/chrome/browser/content_settings/cookie_settings.cc
|
| index 9407cbc8e58541d723a911e83525c98da2100710..aed029eb82fe426b665a90abd81980f343fe5875 100644
|
| --- a/chrome/browser/content_settings/cookie_settings.cc
|
| +++ b/chrome/browser/content_settings/cookie_settings.cc
|
| @@ -155,20 +155,14 @@ void CookieSettings::ResetCookieSetting(
|
| CONTENT_SETTING_DEFAULT);
|
| }
|
|
|
| -void CookieSettings::Observe(int type,
|
| - const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) {
|
| +void CookieSettings::OnPreferenceChanged(PrefServiceBase* prefs,
|
| + const std::string& name) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| - DCHECK_EQ(chrome::NOTIFICATION_PREF_CHANGED, type);
|
| - DCHECK_EQ(std::string(prefs::kBlockThirdPartyCookies),
|
| - *content::Details<std::string>(details).ptr());
|
| -
|
| - PrefService* prefs = content::Source<PrefService>(source).ptr();
|
| - {
|
| - base::AutoLock auto_lock(lock_);
|
| - block_third_party_cookies_ = prefs->GetBoolean(
|
| - prefs::kBlockThirdPartyCookies);
|
| - }
|
| + DCHECK_EQ(std::string(prefs::kBlockThirdPartyCookies), name);
|
| +
|
| + base::AutoLock auto_lock(lock_);
|
| + block_third_party_cookies_ = prefs->GetBoolean(
|
| + prefs::kBlockThirdPartyCookies);
|
| }
|
|
|
| void CookieSettings::ShutdownOnUIThread() {
|
|
|