| 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();
|
| }
|
|
|