chrome/browser/ui/webui/options/content_settings_handler.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/ui/webui/options/content_settings_handler.cc

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

Patch Set: fix comment alignment 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

« chrome/browser/push_messaging/push_messaging_browsertest.cc ('K') | « chrome/browser/ui/exclusive_access/fullscreen_controller.cc ('k') | chrome/browser/ui/webui/plugins/plugins_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/content_settings_handler.cc

diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc

index 3f17e4b2b13b8e8181f4dfd575d70115193049a8..f17f5d0f62bf9c4de4a8aa182c338b81a61df16e 100644

--- a/chrome/browser/ui/webui/options/content_settings_handler.cc

+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc

@@ -1340,7 +1340,7 @@ void ContentSettingsHandler::RemoveExceptionFromHostContentSettingsMap(

mode == "normal" ? GetContentSettingsMap() :

GetOTRContentSettingsMap();

if (settings_map) {

- settings_map->SetContentSetting(

+ settings_map->SetContentSettingCustomScope(

ContentSettingsPattern::FromString(pattern),

secondary_pattern.empty()

? ContentSettingsPattern::Wildcard()

@@ -1512,11 +1512,9 @@ void ContentSettingsHandler::SetException(const base::ListValue* args) {

content_settings::ContentSettingFromString(setting, &setting_type);

DCHECK(result);

- settings_map->SetContentSetting(ContentSettingsPattern::FromString(pattern),

- ContentSettingsPattern::Wildcard(),

- type,

- std::string(),

- setting_type);

+ settings_map->SetContentSettingCustomScope(

+ ContentSettingsPattern::FromString(pattern),

+ ContentSettingsPattern::Wildcard(), type, std::string(), setting_type);

WebSiteSettingsUmaUtil::LogPermissionChange(type, setting_type);

}