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

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

Issue 2278303002: Remove the allow-displaying-mixed-content setting from Blink. (Closed)
Patch Set: Updated JNI mixed content settings getters for Android WebView 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 1012 matching lines...) Expand 10 before | Expand all | Expand 10 after
1023 1023
1024 // Set MSAA sample count for 2d canvas if requested on the command line (or 1024 // Set MSAA sample count for 2d canvas if requested on the command line (or
1025 // default value if not). 1025 // default value if not).
1026 settings->setAccelerated2dCanvasMSAASampleCount( 1026 settings->setAccelerated2dCanvasMSAASampleCount(
1027 prefs.accelerated_2d_canvas_msaa_sample_count); 1027 prefs.accelerated_2d_canvas_msaa_sample_count);
1028 1028
1029 // Tabs to link is not part of the settings. WebCore calls 1029 // Tabs to link is not part of the settings. WebCore calls
1030 // ChromeClient::tabsToLinks which is part of the glue code. 1030 // ChromeClient::tabsToLinks which is part of the glue code.
1031 web_view->setTabsToLinks(prefs.tabs_to_links); 1031 web_view->setTabsToLinks(prefs.tabs_to_links);
1032 1032
1033 settings->setAllowDisplayOfInsecureContent(
1034 prefs.allow_displaying_insecure_content);
1035 settings->setAllowRunningOfInsecureContent( 1033 settings->setAllowRunningOfInsecureContent(
1036 prefs.allow_running_insecure_content); 1034 prefs.allow_running_insecure_content);
1037 settings->setDisableReadingFromCanvas(prefs.disable_reading_from_canvas); 1035 settings->setDisableReadingFromCanvas(prefs.disable_reading_from_canvas);
1038 settings->setStrictMixedContentChecking(prefs.strict_mixed_content_checking); 1036 settings->setStrictMixedContentChecking(prefs.strict_mixed_content_checking);
1039 1037
1040 settings->setStrictlyBlockBlockableMixedContent( 1038 settings->setStrictlyBlockBlockableMixedContent(
1041 prefs.strictly_block_blockable_mixed_content); 1039 prefs.strictly_block_blockable_mixed_content);
1042 1040
1043 settings->setStrictMixedContentCheckingForPlugin( 1041 settings->setStrictMixedContentCheckingForPlugin(
1044 prefs.block_mixed_plugin_content); 1042 prefs.block_mixed_plugin_content);
(...skipping 2037 matching lines...) Expand 10 before | Expand all | Expand 10 after
3082 return render_frame->focused_pepper_plugin(); 3080 return render_frame->focused_pepper_plugin();
3083 } 3081 }
3084 frame = frame->traverseNext(false); 3082 frame = frame->traverseNext(false);
3085 } 3083 }
3086 3084
3087 return nullptr; 3085 return nullptr;
3088 } 3086 }
3089 #endif 3087 #endif
3090 3088
3091 } // namespace content 3089 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698