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/render_view.h | |
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/render_view.h')
-rw-r--r-- | chrome/renderer/render_view.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h index a09e9f1..a7de84b 100644 --- a/chrome/renderer/render_view.h +++ b/chrome/renderer/render_view.h @@ -916,12 +916,6 @@ class RenderView : public RenderWidget, const FilePath& path, pepper::PluginModule* pepper_module); - // Create a new placeholder for a blocked plugin. - WebKit::WebPlugin* CreateBlockedPluginPlaceholder( - WebKit::WebFrame* frame, - const WebKit::WebPluginParams& params, - PluginGroup* group); - WebKit::WebPlugin* CreateOutdatedPluginPlaceholder( WebKit::WebFrame* frame, const WebKit::WebPluginParams& params, |