chrome/browser/android/preferences/website_preference_bridge.cc - Issue 1694063002: Use GURLS instead of patterns in SetCookieSetting()

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/android/preferences/website_preference_bridge.cc

Issue 1694063002: Use GURLS instead of patterns in SetCookieSetting() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scoping_set_content_setting

Patch Set: Add SetCookieException to handle custom patterns Created 4 years, 9 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

Index: chrome/browser/android/preferences/website_preference_bridge.cc

diff --git a/chrome/browser/android/preferences/website_preference_bridge.cc b/chrome/browser/android/preferences/website_preference_bridge.cc

index 070514a98cd9249014f6ded70a41d745b7c55377..915c777ec6005d1f39e7fc91d2967dc493900773 100644

--- a/chrome/browser/android/preferences/website_preference_bridge.cc

+++ b/chrome/browser/android/preferences/website_preference_bridge.cc

@@ -471,11 +471,11 @@ static void SetCookieSettingForOrigin(JNIEnv* env,

GetCookieSettings()->ResetCookieSetting(primary_pattern, secondary_pattern);

} else {

setting = value ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;

- GetCookieSettings()->SetCookieSetting(primary_pattern, secondary_pattern,

- setting);

+ GetCookieSettings()->SetCookieException(primary_pattern, secondary_pattern,

+ setting);

}

- WebSiteSettingsUmaUtil::LogPermissionChange(

- CONTENT_SETTINGS_TYPE_NOTIFICATIONS, setting);

+ WebSiteSettingsUmaUtil::LogPermissionChange(CONTENT_SETTINGS_TYPE_COOKIES,

+ setting);

}

static jboolean IsContentSettingsPatternValid(

« no previous file with comments | « no previous file | chrome/browser/browsing_data/cookies_tree_model.cc » ('j') | components/content_settings/core/browser/cookie_settings.cc » ('J')