components/content_settings/core/browser/content_settings_utils.cc - Issue 1252073002: Move pref names and default value into WebsiteSettingsInfo

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: components/content_settings/core/browser/content_settings_utils.cc

Issue 1252073002: Move pref names and default value into WebsiteSettingsInfo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@website-settings-registry-simple

Patch Set: Created 5 years, 4 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 | « components/content_settings/core/browser/content_settings_utils.h ('k') | components/content_settings/core/browser/plugins_field_trial_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/content_settings/core/browser/content_settings_utils.cc

diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc

index 6a9a65574b2f7ccd72c1576c7b9e9eeec7a4354c..0b40d2239b45f84fbb7a8f32389afe8acd7922a8 100644

--- a/components/content_settings/core/browser/content_settings_utils.cc

+++ b/components/content_settings/core/browser/content_settings_utils.cc

@@ -30,10 +30,6 @@ const char kPatternSeparator[] = ",";

namespace content_settings {

-std::string GetTypeName(ContentSettingsType type) {

- return WebsiteSettingsRegistry::GetInstance()->Get(type)->name();

std::string ContentSettingToString(ContentSetting setting) {

switch (setting) {

case CONTENT_SETTING_ALLOW: