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

Side by Side Diff: content/renderer/render_view_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, 4 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 unified diff | Download patch
« no previous file with comments | « content/public/common/web_preferences.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 1050 matching lines...) Expand 10 before | Expand all | Expand 10 after
1061 settings->setAllowDisplayOfInsecureContent( 1061 settings->setAllowDisplayOfInsecureContent(
1062 prefs.allow_displaying_insecure_content); 1062 prefs.allow_displaying_insecure_content);
1063 settings->setAllowRunningOfInsecureContent( 1063 settings->setAllowRunningOfInsecureContent(
1064 prefs.allow_running_insecure_content); 1064 prefs.allow_running_insecure_content);
1065 settings->setDisableReadingFromCanvas(prefs.disable_reading_from_canvas); 1065 settings->setDisableReadingFromCanvas(prefs.disable_reading_from_canvas);
1066 settings->setStrictMixedContentChecking(prefs.strict_mixed_content_checking); 1066 settings->setStrictMixedContentChecking(prefs.strict_mixed_content_checking);
1067 1067
1068 settings->setStrictlyBlockBlockableMixedContent( 1068 settings->setStrictlyBlockBlockableMixedContent(
1069 prefs.strictly_block_blockable_mixed_content); 1069 prefs.strictly_block_blockable_mixed_content);
1070 1070
1071 settings->setStrictMixedContentCheckingForPlugin(
1072 prefs.block_mixed_plugin_content);
1073
1071 settings->setStrictPowerfulFeatureRestrictions( 1074 settings->setStrictPowerfulFeatureRestrictions(
1072 prefs.strict_powerful_feature_restrictions); 1075 prefs.strict_powerful_feature_restrictions);
1073 settings->setPasswordEchoEnabled(prefs.password_echo_enabled); 1076 settings->setPasswordEchoEnabled(prefs.password_echo_enabled);
1074 settings->setShouldPrintBackgrounds(prefs.should_print_backgrounds); 1077 settings->setShouldPrintBackgrounds(prefs.should_print_backgrounds);
1075 settings->setShouldClearDocumentBackground( 1078 settings->setShouldClearDocumentBackground(
1076 prefs.should_clear_document_background); 1079 prefs.should_clear_document_background);
1077 settings->setEnableScrollAnimator(prefs.enable_scroll_animator); 1080 settings->setEnableScrollAnimator(prefs.enable_scroll_animator);
1078 1081
1079 WebRuntimeFeatures::enableTouch(prefs.touch_enabled); 1082 WebRuntimeFeatures::enableTouch(prefs.touch_enabled);
1080 settings->setMaxTouchPoints(prefs.pointer_events_max_touch_points); 1083 settings->setMaxTouchPoints(prefs.pointer_events_max_touch_points);
(...skipping 2734 matching lines...) Expand 10 before | Expand all | Expand 10 after
3815 std::vector<gfx::Size> sizes; 3818 std::vector<gfx::Size> sizes;
3816 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 3819 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
3817 if (!url.isEmpty()) 3820 if (!url.isEmpty())
3818 urls.push_back( 3821 urls.push_back(
3819 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 3822 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
3820 } 3823 }
3821 SendUpdateFaviconURL(urls); 3824 SendUpdateFaviconURL(urls);
3822 } 3825 }
3823 3826
3824 } // namespace content 3827 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/web_preferences.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698