Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5327)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/renderer/render_view.cc

Issue 5238002: Reintegrate 552 r66225-r66645.... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/552d/src/
Patch Set: '' Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | third_party/libxml/README.chromium » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/render_view.cc
===================================================================
--- chrome/renderer/render_view.cc (revision 66837)
+++ chrome/renderer/render_view.cc (working copy)
@@ -2656,12 +2656,7 @@
}
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);
}
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | third_party/libxml/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698