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

Side by Side 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: Rebase on core CL. 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/content_settings/content_setting_image_model.h" 5 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
6 6
7 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" 7 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
8 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 8 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
9 #include "chrome/browser/prerender/prerender_manager.h" 9 #include "chrome/browser/prerender/prerender_manager.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 0, 115 0,
116 0, 116 0,
117 0}, 117 0},
118 {CONTENT_SETTINGS_TYPE_JAVASCRIPT, 118 {CONTENT_SETTINGS_TYPE_JAVASCRIPT,
119 IDR_BLOCKED_JAVASCRIPT, 119 IDR_BLOCKED_JAVASCRIPT,
120 gfx::VectorIconId::CODE, 120 gfx::VectorIconId::CODE,
121 IDS_BLOCKED_JAVASCRIPT_TITLE, 121 IDS_BLOCKED_JAVASCRIPT_TITLE,
122 0, 122 0,
123 0, 123 0,
124 0}, 124 0},
125 {CONTENT_SETTINGS_TYPE_KEYGEN,
126 IDR_BLOCKED_KEYGEN,
127 gfx::VectorIconId::CODE,
128 IDS_BLOCKED_KEYGEN_TITLE,
129 0,
130 0,
131 0},
125 {CONTENT_SETTINGS_TYPE_PLUGINS, 132 {CONTENT_SETTINGS_TYPE_PLUGINS,
126 IDR_BLOCKED_PLUGINS, 133 IDR_BLOCKED_PLUGINS,
127 gfx::VectorIconId::EXTENSION, 134 gfx::VectorIconId::EXTENSION,
128 IDS_BLOCKED_PLUGINS_MESSAGE, 135 IDS_BLOCKED_PLUGINS_MESSAGE,
129 IDS_BLOCKED_PLUGIN_EXPLANATORY_TEXT, 136 IDS_BLOCKED_PLUGIN_EXPLANATORY_TEXT,
130 0, 137 0,
131 0}, 138 0},
132 {CONTENT_SETTINGS_TYPE_POPUPS, 139 {CONTENT_SETTINGS_TYPE_POPUPS,
133 IDR_BLOCKED_POPUPS, 140 IDR_BLOCKED_POPUPS,
134 gfx::VectorIconId::WEB, 141 gfx::VectorIconId::WEB,
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 icon_ = ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(id); 463 icon_ = ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(id);
457 } 464 }
458 465
459 #if !defined(OS_MACOSX) 466 #if !defined(OS_MACOSX)
460 void ContentSettingImageModel::SetIconByVectorId(gfx::VectorIconId id, 467 void ContentSettingImageModel::SetIconByVectorId(gfx::VectorIconId id,
461 bool blocked) { 468 bool blocked) {
462 icon_ = GetIcon(id, blocked ? gfx::VectorIconId::BLOCKED_BADGE 469 icon_ = GetIcon(id, blocked ? gfx::VectorIconId::BLOCKED_BADGE
463 : gfx::VectorIconId::VECTOR_ICON_NONE); 470 : gfx::VectorIconId::VECTOR_ICON_NONE);
464 } 471 }
465 #endif 472 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698