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

Unified Diff: chrome/browser/ui/content_settings/content_setting_image_model.cc

Issue 1432573002: Adding <keygen> Content Setting (Android UI) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@keygen_ui
Patch Set: Fix rebase across multiple ancestors. 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 56d522106dd03bc02c80f906b25f653434f45822..e2fcff3cb8301fe4ad6383a4e35432997895c830 100644
--- a/chrome/browser/ui/content_settings/content_setting_image_model.cc
+++ b/chrome/browser/ui/content_settings/content_setting_image_model.cc
@@ -136,6 +136,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,
@@ -171,6 +178,13 @@ static const ContentSettingsImageDetails kImageDetails[] = {
IDS_BLOCKED_DOWNLOADS_EXPLANATION,
IDR_ALLOWED_DOWNLOADS,
IDS_ALLOWED_DOWNLOAD_TITLE},
+ {CONTENT_SETTINGS_TYPE_KEYGEN,
+ IDR_BLOCKED_KEYGEN,
+ gfx::VectorIconId::CODE,
+ IDS_BLOCKED_KEYGEN_TITLE,
+ 0,
+ 0,
+ 0},
};
const ContentSettingsImageDetails* GetImageDetails(ContentSettingsType type) {
@@ -563,6 +577,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));
@@ -572,6 +588,8 @@ ScopedVector<ContentSettingImageModel>
new ContentSettingBlockedImageModel(
CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS));
result.push_back(new ContentSettingMIDISysExImageModel());
+ result.push_back(
+ new ContentSettingBlockedImageModel(CONTENT_SETTINGS_TYPE_KEYGEN));
return result.Pass();
}

Powered by Google App Engine
This is Rietveld 408576698