chrome/browser/android/preferences/pref_service_bridge.cc - Issue 1818843002: Rename SetContentSetting() to SetContentSettingCustomScope()

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/pref_service_bridge.cc

Issue 1818843002: Rename SetContentSetting() to SetContentSettingCustomScope() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: minor change Created 4 years, 8 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/pref_service_bridge.cc

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

index a3e4acace9504b7d292e4b3beb5b5c46185cb300..374a7bd3d2dfe401969cd949593612468944aee6 100644

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

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

@@ -163,11 +163,10 @@ static void SetContentSettingForPattern(JNIEnv* env,

int setting) {

HostContentSettingsMap* host_content_settings_map =

HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());

- host_content_settings_map->SetContentSetting(

+ host_content_settings_map->SetContentSettingCustomScope(

ContentSettingsPattern::FromString(ConvertJavaStringToUTF8(env, pattern)),

ContentSettingsPattern::Wildcard(),

- static_cast<ContentSettingsType>(content_settings_type),

- std::string(),

+ static_cast<ContentSettingsType>(content_settings_type), std::string(),

static_cast<ContentSetting>(setting));

}

« no previous file with comments | « no previous file | chrome/browser/content_settings/host_content_settings_map_unittest.cc » ('j') | no next file with comments »