diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-01 08:07:46 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-01 08:07:46 +0000 |
| commit | a16a421b3959938bd40e9101b2bc86f4ad46e454 (patch) | |
| tree | d578fb60741ab29186bc6d24f69402f28782f678 /chrome/renderer | |
| parent | d37d45ab0d5ef606b0f44d9591bfdb457d7de733 (diff) | |
| download | chromium_src-a16a421b3959938bd40e9101b2bc86f4ad46e454.zip chromium_src-a16a421b3959938bd40e9101b2bc86f4ad46e454.tar.gz chromium_src-a16a421b3959938bd40e9101b2bc86f4ad46e454.tar.bz2 | |
Enable click-to-play by default.
Click-to-play can be disabled using the --disable-click-to-play command line switch.
BUG=35316
TEST=none
Review URL: http://codereview.chromium.org/3250012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58147 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/render_view.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 49e6934..861722a 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -2359,7 +2359,7 @@ WebPlugin* RenderView::createPlugin(WebFrame* frame, #endif } if (setting == CONTENT_SETTING_BLOCK) { - DCHECK(cmd->HasSwitch(switches::kEnableClickToPlay)); + DCHECK(!cmd->HasSwitch(switches::kDisableClickToPlay)); DidBlockContentType(CONTENT_SETTINGS_TYPE_PLUGINS, resource); return CreatePluginPlaceholder(frame, params, NULL); } @@ -2525,12 +2525,12 @@ bool RenderView::allowImages(WebFrame* frame, bool enabled_per_settings) { } bool RenderView::allowPlugins(WebFrame* frame, bool enabled_per_settings) { - if (CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableClickToPlay)) { + if (!CommandLine::ForCurrentProcess()->HasSwitch( + switches::kDisableClickToPlay)) { return WebFrameClient::allowPlugins(frame, enabled_per_settings); } - return (enabled_per_settings && - AllowContentType(CONTENT_SETTINGS_TYPE_PLUGINS)); + return enabled_per_settings && + AllowContentType(CONTENT_SETTINGS_TYPE_PLUGINS); } |