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

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

Issue 777103002: Add the names of plugins to the blocked plugin bubble. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: make mergeable by reusing an existing string with existing translation Created 6 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_bubble_model.cc
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
index 1e3433a5ca01d000f1854756f0ec8aa07225a17a..e77e08daf1278093befb1ddaf151c9cf60205dc9 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
@@ -108,11 +108,22 @@ ContentSettingTitleAndLinkModel::ContentSettingTitleAndLinkModel(
}
void ContentSettingTitleAndLinkModel::SetTitle() {
+ if (content_type() == CONTENT_SETTINGS_TYPE_PLUGINS &&
+ TabSpecificContentSettings::FromWebContents(web_contents())
Lei Zhang 2014/12/05 22:18:05 If you save the return value, you can then call it
Will Harris 2014/12/08 00:21:11 Ack. restructured this and also checked for non NU
+ ->IsContentBlocked(content_type())) {
+ const base::string16 plugin_names =
+ TabSpecificContentSettings::FromWebContents(web_contents())
+ ->blocked_plugin_names();
+ if (!plugin_names.empty()) {
+ set_plugin_names(plugin_names);
+ }
+ }
+
static const ContentSettingsTypeIdEntry kBlockedTitleIDs[] = {
{CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_TITLE},
{CONTENT_SETTINGS_TYPE_IMAGES, IDS_BLOCKED_IMAGES_TITLE},
{CONTENT_SETTINGS_TYPE_JAVASCRIPT, IDS_BLOCKED_JAVASCRIPT_TITLE},
- {CONTENT_SETTINGS_TYPE_PLUGINS, IDS_BLOCKED_PLUGINS_MESSAGE},
+ {CONTENT_SETTINGS_TYPE_PLUGINS, IDS_BLOCKED_PLUGINS_TITLE},
{CONTENT_SETTINGS_TYPE_POPUPS, IDS_BLOCKED_POPUPS_TITLE},
{CONTENT_SETTINGS_TYPE_MIXEDSCRIPT,
IDS_BLOCKED_DISPLAYING_INSECURE_CONTENT},

Powered by Google App Engine
This is Rietveld 408576698