chrome/browser/extensions/api/content_settings/content_settings_store.cc - Issue 1372353004: Making structure for ContentSettings and its corresponding strings.

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/extensions/api/content_settings/content_settings_store.cc

Issue 1372353004: Making structure for ContentSettings and its corresponding strings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Changes as per review comments. Created 5 years, 2 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/extensions/api/content_settings/content_settings_api.cc ('K') | « chrome/browser/extensions/api/content_settings/content_settings_helpers.cc ('k') | chrome/browser/resources/options/content_settings_exceptions_area.js » ('j') | chrome/browser/resources/options/content_settings_exceptions_area.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/content_settings/content_settings_store.cc

diff --git a/chrome/browser/extensions/api/content_settings/content_settings_store.cc b/chrome/browser/extensions/api/content_settings/content_settings_store.cc

index c81a38458fbc4d320be38a72a1988919be9dbd6a..80c1dfc478a2750fe0810e20eb6a7cc195acb4fc 100644

--- a/chrome/browser/extensions/api/content_settings/content_settings_store.cc

+++ b/chrome/browser/extensions/api/content_settings/content_settings_store.cc

@@ -273,7 +273,7 @@ base::ListValue* ContentSettingsStore::GetSettingsForExtension(

DCHECK_NE(CONTENT_SETTING_DEFAULT, content_setting);

setting_dict->SetString(

keys::kContentSettingKey,

- helpers::ContentSettingToString(content_setting));

+ content_settings::ContentSettingToString(content_setting));

settings->Append(setting_dict);

}

@@ -314,10 +314,9 @@ void ContentSettingsStore::SetExtensionContentSettingFromList(

std::string content_setting_string;

dict->GetString(keys::kContentSettingKey, &content_setting_string);

- ContentSetting setting = CONTENT_SETTING_DEFAULT;

- bool result =

- helpers::StringToContentSetting(content_setting_string, &setting);

- DCHECK(result);

+ ContentSetting setting =

+ content_settings::ContentSettingFromString(content_setting_string);

+ DCHECK_NE(CONTENT_SETTING_DEFAULT, setting);

SetExtensionContentSetting(extension_id,

primary_pattern,