chrome/browser/content_settings/cookie_settings.cc - Issue 11307020: Cleanup: Simplify some extensions / content_settings Observer code by simply DCHECKING instead of u…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/content_settings/cookie_settings.cc

Issue 11307020: Cleanup: Simplify some extensions / content_settings Observer code by simply DCHECKING instead of u… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Flip DCHECK_EQ arguments to (expected, actual) Created 8 years, 2 months 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/content_settings/content_settings_pref_provider.cc ('k') | chrome/browser/extensions/api/font_settings/font_settings_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/cookie_settings.cc

===================================================================

--- chrome/browser/content_settings/cookie_settings.cc (revision 165014)

+++ chrome/browser/content_settings/cookie_settings.cc (working copy)

@@ -159,20 +159,15 @@

const content::NotificationSource& source,

const content::NotificationDetails& details) {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

+ DCHECK_EQ(chrome::NOTIFICATION_PREF_CHANGED, type);

+ DCHECK_EQ(std::string(prefs::kBlockThirdPartyCookies),

+ *content::Details<std::string>(details).ptr());

- if (type == chrome::NOTIFICATION_PREF_CHANGED) {

- PrefService* prefs = content::Source<PrefService>(source).ptr();

- std::string* name = content::Details<std::string>(details).ptr();

- if (*name == prefs::kBlockThirdPartyCookies) {

- base::AutoLock auto_lock(lock_);

- block_third_party_cookies_ = prefs->GetBoolean(

- prefs::kBlockThirdPartyCookies);

- } else {

- NOTREACHED() << "Unexpected preference observed";

- return;

- }

- } else {

- NOTREACHED() << "Unexpected notification";

+ PrefService* prefs = content::Source<PrefService>(source).ptr();

+ {

+ base::AutoLock auto_lock(lock_);

+ block_third_party_cookies_ = prefs->GetBoolean(

+ prefs::kBlockThirdPartyCookies);

}