summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/render_view.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/renderer/render_view.cc')
-rw-r--r--chrome/renderer/render_view.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 9b0a283..28d0f86 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -2726,12 +2726,7 @@ bool RenderView::allowImages(WebFrame* frame, bool enabled_per_settings) {
}
bool RenderView::allowPlugins(WebFrame* frame, bool enabled_per_settings) {
- if (!CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableClickToPlay)) {
- return WebFrameClient::allowPlugins(frame, enabled_per_settings);
- }
- return enabled_per_settings &&
- AllowContentType(CONTENT_SETTINGS_TYPE_PLUGINS);
+ return WebFrameClient::allowPlugins(frame, enabled_per_settings);
}