chrome/browser/ui/content_settings/content_setting_bubble_model.cc - Issue 7008025: Apply third party cookie blocking to all kinds of cookies

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/ui/content_settings/content_setting_bubble_model.cc

Issue 7008025: Apply third party cookie blocking to all kinds of cookies (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: updates Created 9 years, 7 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:

Index: chrome/browser/ui/content_settings/content_setting_bubble_model.cc

diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc

index 865f1c2f31b1a9f44b8e7ca6ded14d07a7c9653c..1d96238eeb2d29daabd78a75768d494c8d864ccd 100644

--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc

+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc

@@ -280,7 +280,9 @@ class ContentSettingSingleRadioGroup

ContentSetting mostRestrictiveSetting;

if (resources.empty()) {

mostRestrictiveSetting =

- map->GetContentSetting(url, content_type(), std::string());

+ content_type() == CONTENT_SETTINGS_TYPE_COOKIES ?

+ map->GetCookieContentSetting(url, url, true) :

+ map->GetContentSetting(url, content_type(), std::string());

} else {

mostRestrictiveSetting = CONTENT_SETTING_ALLOW;

for (std::set<std::string>::const_iterator it = resources.begin();