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

Unified Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 1260163005: Appease jschuh@ by adding a field trial to move 'plugin' to blockable mixed content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@settingh
Patch Set: Created 5 years, 5 months 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 | « no previous file | content/public/common/common_param_traits_macros.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_view_host_impl.cc
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index 3363c5145d5073b0496c15a23a5933a3ec549962..73da6b4f4a80e1c8ea461b939c33a6b18350c71c 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -528,6 +528,11 @@ WebPreferences RenderViewHostImpl::ComputeWebkitPrefs() {
prefs.strictly_block_blockable_mixed_content =
blockable_mixed_content_group == "StrictlyBlockBlockableMixedContent";
+ const std::string plugin_mixed_content_status =
+ base::FieldTrialList::FindFullName("PluginMixedContentStatus");
+ prefs.block_mixed_plugin_content =
+ plugin_mixed_content_status == "BlockableMixedContent";
+
prefs.v8_cache_options = GetV8CacheOptions();
GetContentClient()->browser()->OverrideWebkitPrefs(this, &prefs);
« no previous file with comments | « no previous file | content/public/common/common_param_traits_macros.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698