summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-12 20:38:58 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-12 20:38:58 +0000
commit2d498eec384907d4f2c411324d4341b85e31f12c (patch)
tree57df0898131c5cf7c1228537086a0a54019f315a /chrome/app
parent26f89e38c15a72ac67433b7c44a9996a6624d900 (diff)
downloadchromium_src-2d498eec384907d4f2c411324d4341b85e31f12c.zip
chromium_src-2d498eec384907d4f2c411324d4341b85e31f12c.tar.gz
chromium_src-2d498eec384907d4f2c411324d4341b85e31f12c.tar.bz2
Remove BlockedPluginManager entirely. It only existed to show infobars for blocked plugins, which it hasn't done since r62146, and there are no firm plans to do so in the future.
This is important because http://codereview.chromium.org/4767001/ is going to make calling RemoveInfoBar() with a non-showing delegate an error, and it seems better to just remove all this code if it's not doing anything than to neuter parts of it. BUG=62154 TEST=none Review URL: http://codereview.chromium.org/4863001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65984 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd9
1 files changed, 0 insertions, 9 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index a409a09..9216a324 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -2432,9 +2432,6 @@ each locale. -->
<message name="IDS_BLOCKED_PLUGINS_LOAD_ALL" desc="Button to load all blocked plugins on a page, displayed in bubble when a page tries to display plug-ins.">
Run all plug-ins this time
</message>
- <message name="IDS_BLOCKED_PLUGINS_UNBLOCK_SHORT" desc="Button to unblock nonsandboxed plug-ins on a site">
- Always on this site
- </message>
<!-- SSL error strings -->
<message name="IDS_SEVERAL_SSL_ERRORS" desc="Bubble info header text when there is more than 1 error">
@@ -4203,9 +4200,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_PLUGIN_LOAD" desc="The link for loading a blocked plug-in, displayed in the click-to-play UI.">
Click to run this plug-in
</message>
- <message name="IDS_PLUGIN_LOAD_SHORT" desc="The link for loading all blocked plug-ins, displayed in the infobar.">
- Allow
- </message>
<message name="IDS_PLUGIN_UPDATE" desc="The link for updating an outdated plug-in.">
Update plug-in...
</message>
@@ -7498,9 +7492,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_PLUGININSTALLER_PROBLEMSINSTALLING" desc="Infobar text for link to help center">
Problems installing?
</message>
- <message name="IDS_PLUGIN_BLOCKED_PROMPT" desc="Info Bar message when a non-sandboxed plugin was blocked">
- This website uses the <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph> plug-in; allow this plug-in to run?
- </message>
<message name="IDS_PLUGIN_OUTDATED_PROMPT" desc="Info Bar message when an outdated plugin was disabled">
The <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph> plug-in was disabled because it is out of date.
</message>