diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-11 15:42:14 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-11 15:42:14 +0000 |
| commit | fc61e22e068da641dc88c528ba4f37c9f55001d0 (patch) | |
| tree | a34765817c418e79bb7cadbe6a29566bbf21cee1 /chrome/renderer/resources | |
| parent | 1f34e1b8d03b1f916fd14ea433a135bd659cd9d2 (diff) | |
| download | chromium_src-fc61e22e068da641dc88c528ba4f37c9f55001d0.zip chromium_src-fc61e22e068da641dc88c528ba4f37c9f55001d0.tar.gz chromium_src-fc61e22e068da641dc88c528ba4f37c9f55001d0.tar.bz2 | |
Change plugin content settings to three states: Allow, click-to-play, and block.
The click-to-play default setting says "Let me choose which plug-ins to run".
XIB changes: Change the middle radio button label in plug-in default settings from IDS_PLUGINS_LOAD_SANDBOXED_RADIO to IDS_PLUGINS_ASK_RADIO.
BUG=35316,56514,56270
TEST=ContentSettingsBubbleModelTest.*, mainly
Review URL: http://codereview.chromium.org/3608007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62146 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/resources')
| -rw-r--r-- | chrome/renderer/resources/blocked_plugin.html | 2 | ||||
| -rw-r--r-- | chrome/renderer/resources/outdated_plugin.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/renderer/resources/blocked_plugin.html b/chrome/renderer/resources/blocked_plugin.html index ff94e01..d8309ed 100644 --- a/chrome/renderer/resources/blocked_plugin.html +++ b/chrome/renderer/resources/blocked_plugin.html @@ -75,7 +75,7 @@ FIXME: This causes flickering on hover. <div id="outer" onclick="plugin.load()"> <div id="inner"> <div><img id="plugin_icon" src="plugin_blocked.png" /></div> -<h1 i18n-content="loadPlugin">PLUGIN_LOAD</h1> +<h1 i18n-content="message">PLUGIN_LOAD</h1> <p id="debug"> </p> </div> </div> diff --git a/chrome/renderer/resources/outdated_plugin.html b/chrome/renderer/resources/outdated_plugin.html index bf55ae4..75460eb 100644 --- a/chrome/renderer/resources/outdated_plugin.html +++ b/chrome/renderer/resources/outdated_plugin.html @@ -55,7 +55,7 @@ p { <div id="outer"> <div id="inner"> <div><img id="plugin_icon" src="plugin_blocked.png" /></div> -<h1 i18n-content="pluginOutdated">PLUGIN_OUTDATED</h1> +<h1 i18n-content="message">PLUGIN_OUTDATED</h1> <p id="debug"> </p> </div> </div> |