Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(115)

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: Rebase? Created 4 years, 11 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
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 fd9cbbf37d03f61f0e2e1c75163c2d63f0875b0d..8bdafdc61325c45e895c3ab75a9718c8ff6b31fd 100644
--- a/components/content_settings/core/browser/host_content_settings_map.cc
+++ b/components/content_settings/core/browser/host_content_settings_map.cc
@@ -344,7 +344,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);

Powered by Google App Engine
This is Rietveld 408576698