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

Unified Diff: chrome/browser/ui/content_settings/content_setting_image_model.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
Index: chrome/browser/ui/content_settings/content_setting_image_model.cc
diff --git a/chrome/browser/ui/content_settings/content_setting_image_model.cc b/chrome/browser/ui/content_settings/content_setting_image_model.cc
index 93493b8f7fbd1ba656f17ebc9006fa28f30767e6..721be44c3cd16e2a1ca97e4d3d47bfdcd315d7b8 100644
--- a/chrome/browser/ui/content_settings/content_setting_image_model.cc
+++ b/chrome/browser/ui/content_settings/content_setting_image_model.cc
@@ -139,6 +139,13 @@ static const ContentSettingsImageDetails kImageDetails[] = {
0,
0,
0},
+ {CONTENT_SETTINGS_TYPE_KEYGEN,
+ IDR_BLOCKED_KEYGEN,
+ gfx::VectorIconId::CODE,
+ IDS_BLOCKED_KEYGEN_TITLE,
+ 0,
+ 0,
+ 0},
{CONTENT_SETTINGS_TYPE_PLUGINS,
IDR_BLOCKED_PLUGINS,
gfx::VectorIconId::EXTENSION,
@@ -580,6 +587,8 @@ ScopedVector<ContentSettingImageModel>
new ContentSettingBlockedImageModel(CONTENT_SETTINGS_TYPE_PLUGINS));
result.push_back(
new ContentSettingBlockedImageModel(CONTENT_SETTINGS_TYPE_POPUPS));
+ result.push_back(
+ new ContentSettingBlockedImageModel(CONTENT_SETTINGS_TYPE_KEYGEN));
result.push_back(new ContentSettingGeolocationImageModel());
result.push_back(
new ContentSettingBlockedImageModel(CONTENT_SETTINGS_TYPE_MIXEDSCRIPT));

Powered by Google App Engine
This is Rietveld 408576698