OLD | NEW |
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 1046 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1057 // Tabs to link is not part of the settings. WebCore calls | 1057 // Tabs to link is not part of the settings. WebCore calls |
1058 // ChromeClient::tabsToLinks which is part of the glue code. | 1058 // ChromeClient::tabsToLinks which is part of the glue code. |
1059 web_view->setTabsToLinks(prefs.tabs_to_links); | 1059 web_view->setTabsToLinks(prefs.tabs_to_links); |
1060 | 1060 |
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 |
| 1068 settings->setStrictlyBlockBlockableMixedContent( |
| 1069 prefs.strictly_block_blockable_mixed_content); |
| 1070 |
1067 settings->setStrictPowerfulFeatureRestrictions( | 1071 settings->setStrictPowerfulFeatureRestrictions( |
1068 prefs.strict_powerful_feature_restrictions); | 1072 prefs.strict_powerful_feature_restrictions); |
1069 settings->setPasswordEchoEnabled(prefs.password_echo_enabled); | 1073 settings->setPasswordEchoEnabled(prefs.password_echo_enabled); |
1070 settings->setShouldPrintBackgrounds(prefs.should_print_backgrounds); | 1074 settings->setShouldPrintBackgrounds(prefs.should_print_backgrounds); |
1071 settings->setShouldClearDocumentBackground( | 1075 settings->setShouldClearDocumentBackground( |
1072 prefs.should_clear_document_background); | 1076 prefs.should_clear_document_background); |
1073 settings->setEnableScrollAnimator(prefs.enable_scroll_animator); | 1077 settings->setEnableScrollAnimator(prefs.enable_scroll_animator); |
1074 | 1078 |
1075 WebRuntimeFeatures::enableTouch(prefs.touch_enabled); | 1079 WebRuntimeFeatures::enableTouch(prefs.touch_enabled); |
1076 settings->setMaxTouchPoints(prefs.pointer_events_max_touch_points); | 1080 settings->setMaxTouchPoints(prefs.pointer_events_max_touch_points); |
(...skipping 2734 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3811 std::vector<gfx::Size> sizes; | 3815 std::vector<gfx::Size> sizes; |
3812 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 3816 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
3813 if (!url.isEmpty()) | 3817 if (!url.isEmpty()) |
3814 urls.push_back( | 3818 urls.push_back( |
3815 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 3819 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
3816 } | 3820 } |
3817 SendUpdateFaviconURL(urls); | 3821 SendUpdateFaviconURL(urls); |
3818 } | 3822 } |
3819 | 3823 |
3820 } // namespace content | 3824 } // namespace content |
OLD | NEW |