Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(736)

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: remove unused 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
« no previous file with comments | « no previous file | chrome/browser/browsing_data/cookies_tree_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 7d68c3088ec9dbb9d0a25511b432fbbe81467c9c..f044ab925c481192e41614036a5959918c5a7a7a 100644
--- a/chrome/browser/android/preferences/website_preference_bridge.cc
+++ b/chrome/browser/android/preferences/website_preference_bridge.cc
@@ -462,19 +462,14 @@ static void SetCookieSettingForOrigin(JNIEnv* env,
jint value,
jboolean is_incognito) {
GURL url(ConvertJavaStringToUTF8(env, origin));
- ContentSettingsPattern primary_pattern(
- ContentSettingsPattern::FromURLNoWildcard(url));
- ContentSettingsPattern secondary_pattern(ContentSettingsPattern::Wildcard());
- ContentSetting setting = CONTENT_SETTING_DEFAULT;
- if (value == -1) {
+ ContentSetting setting = static_cast<ContentSetting>(value);
+ if (setting == CONTENT_SETTING_DEFAULT) {
GetCookieSettings()->ResetCookieSetting(url);
} else {
- setting = value ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;
- GetCookieSettings()->SetCookieSetting(primary_pattern, secondary_pattern,
- setting);
+ GetCookieSettings()->SetCookieSetting(url, 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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698