components/content_settings/core/browser/content_settings_default_provider.cc - Issue 1417173010: Adding <keygen> Content Setting (core)

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_default_provider.cc

Issue 1417173010: Adding <keygen> Content Setting (core) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix typos. Created 5 years, 1 month 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/content_settings/host_content_settings_map_unittest.cc ('K') | « chrome/browser/content_settings/tab_specific_content_settings_unittest.cc ('k') | components/content_settings/core/browser/content_settings_policy_provider.cc » ('j') | components/content_settings/core/browser/content_settings_policy_provider.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index ff595f2ed1ddaf7943319ae2d61c0357e6068669..c1ca4cc43214e51e4db14ee41f9e7428e9a49beb 100644

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

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

@@ -194,6 +194,11 @@ DefaultProvider::DefaultProvider(PrefService* prefs, bool incognito)

IntToContentSetting(prefs_->GetInteger(

GetPrefName(CONTENT_SETTINGS_TYPE_PUSH_MESSAGING))),

CONTENT_SETTING_NUM_SETTINGS);

+ UMA_HISTOGRAM_ENUMERATION(

+ "ContentSettings.DefaultKeygenSetting",

+ IntToContentSetting(prefs_->GetInteger(

+ GetPrefName(CONTENT_SETTINGS_TYPE_KEYGEN))),

+ CONTENT_SETTING_NUM_SETTINGS);

pref_change_registrar_.Init(prefs_);

PrefChangeRegistrar::NamedChangeCallback callback = base::Bind(