components/content_settings/core/browser/host_content_settings_map.cc - Issue 1412523003: Adding <keygen> Content Setting (UI)

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

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

Patch Set: Revert extra change. Created 5 years 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/ui/content_settings/content_setting_bubble_model.cc ('K') | « chrome/browser/ui/webui/options/content_settings_handler.cc ('k') | tools/metrics/actions/actions.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 3887bb5f009c70b618a978e6969b8fc4723eba76..2326706707b389e5b26599055b1ceb98d3544c37 100644

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

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

@@ -294,7 +294,8 @@ void HostContentSettingsMap::SetNarrowestContentSetting(

type == CONTENT_SETTINGS_TYPE_PUSH_MESSAGING) {

primary_pattern = ContentSettingsPattern::FromURL(primary_url);

secondary_pattern = ContentSettingsPattern::Wildcard();

- } else if (type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC ||

+ } else if (type == CONTENT_SETTINGS_TYPE_KEYGEN ||

+ type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC ||

type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA ||

type == CONTENT_SETTINGS_TYPE_NOTIFICATIONS) {

primary_pattern = ContentSettingsPattern::FromURLNoWildcard(primary_url);