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

Unified Diff: chrome/browser/ui/website_settings/website_settings.cc

Issue 1412523003: Adding <keygen> Content Setting (UI) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing keygen location in settings and wildcard. 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
Index: chrome/browser/ui/website_settings/website_settings.cc
diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc
index a62ecbe05b8299e22db765d673e87e4f36469814..2bfa99c667234e1236223a07104e909718a268d1 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -95,6 +95,7 @@ ContentSettingsType kPermissionType[] = {
#if defined(OS_ANDROID)
CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,
#endif
+ CONTENT_SETTINGS_TYPE_KEYGEN,
};
// Returns true if any of the given statuses match |status|.
@@ -288,7 +289,8 @@ void WebsiteSettings::OnSitePermissionChanged(ContentSettingsType type,
type == CONTENT_SETTINGS_TYPE_PUSH_MESSAGING) {
primary_pattern = ContentSettingsPattern::FromURL(site_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(site_url_);

Powered by Google App Engine
This is Rietveld 408576698