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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 2278303002: Remove the allow-displaying-mixed-content setting from Blink. (Closed)
Patch Set: Fixed missign deprecated preference registration. Created 4 years, 3 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
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 #include <memory> 9 #include <memory>
10 10
(...skipping 1009 matching lines...) Expand 10 before | Expand all | Expand 10 after
1020 1020
1021 // Set MSAA sample count for 2d canvas if requested on the command line (or 1021 // Set MSAA sample count for 2d canvas if requested on the command line (or
1022 // default value if not). 1022 // default value if not).
1023 settings->setAccelerated2dCanvasMSAASampleCount( 1023 settings->setAccelerated2dCanvasMSAASampleCount(
1024 prefs.accelerated_2d_canvas_msaa_sample_count); 1024 prefs.accelerated_2d_canvas_msaa_sample_count);
1025 1025
1026 // Tabs to link is not part of the settings. WebCore calls 1026 // Tabs to link is not part of the settings. WebCore calls
1027 // ChromeClient::tabsToLinks which is part of the glue code. 1027 // ChromeClient::tabsToLinks which is part of the glue code.
1028 web_view->setTabsToLinks(prefs.tabs_to_links); 1028 web_view->setTabsToLinks(prefs.tabs_to_links);
1029 1029
1030 settings->setAllowDisplayOfInsecureContent(
1031 prefs.allow_displaying_insecure_content);
1032 settings->setAllowRunningOfInsecureContent( 1030 settings->setAllowRunningOfInsecureContent(
1033 prefs.allow_running_insecure_content); 1031 prefs.allow_running_insecure_content);
1034 settings->setDisableReadingFromCanvas(prefs.disable_reading_from_canvas); 1032 settings->setDisableReadingFromCanvas(prefs.disable_reading_from_canvas);
1035 settings->setStrictMixedContentChecking(prefs.strict_mixed_content_checking); 1033 settings->setStrictMixedContentChecking(prefs.strict_mixed_content_checking);
1036 1034
1037 settings->setStrictlyBlockBlockableMixedContent( 1035 settings->setStrictlyBlockBlockableMixedContent(
1038 prefs.strictly_block_blockable_mixed_content); 1036 prefs.strictly_block_blockable_mixed_content);
1039 1037
1040 settings->setStrictMixedContentCheckingForPlugin( 1038 settings->setStrictMixedContentCheckingForPlugin(
1041 prefs.block_mixed_plugin_content); 1039 prefs.block_mixed_plugin_content);
(...skipping 2013 matching lines...) Expand 10 before | Expand all | Expand 10 after
3055 return render_frame->focused_pepper_plugin(); 3053 return render_frame->focused_pepper_plugin();
3056 } 3054 }
3057 frame = frame->traverseNext(false); 3055 frame = frame->traverseNext(false);
3058 } 3056 }
3059 3057
3060 return nullptr; 3058 return nullptr;
3061 } 3059 }
3062 #endif 3060 #endif
3063 3061
3064 } // namespace content 3062 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/web_preferences.cc ('k') | content/shell/renderer/layout_test/blink_test_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698