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 1018 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1029 settings->setPasswordEchoEnabled(prefs.password_echo_enabled); | 1029 settings->setPasswordEchoEnabled(prefs.password_echo_enabled); |
1030 settings->setShouldPrintBackgrounds(prefs.should_print_backgrounds); | 1030 settings->setShouldPrintBackgrounds(prefs.should_print_backgrounds); |
1031 settings->setShouldClearDocumentBackground( | 1031 settings->setShouldClearDocumentBackground( |
1032 prefs.should_clear_document_background); | 1032 prefs.should_clear_document_background); |
1033 settings->setEnableScrollAnimator(prefs.enable_scroll_animator); | 1033 settings->setEnableScrollAnimator(prefs.enable_scroll_animator); |
1034 | 1034 |
1035 settings->setRegionBasedColumnsEnabled(prefs.region_based_columns_enabled); | 1035 settings->setRegionBasedColumnsEnabled(prefs.region_based_columns_enabled); |
1036 | 1036 |
1037 WebRuntimeFeatures::enableTouch(prefs.touch_enabled); | 1037 WebRuntimeFeatures::enableTouch(prefs.touch_enabled); |
1038 settings->setMaxTouchPoints(prefs.pointer_events_max_touch_points); | 1038 settings->setMaxTouchPoints(prefs.pointer_events_max_touch_points); |
| 1039 settings->setAvailablePointerTypes(prefs.available_pointer_types); |
| 1040 settings->setPrimaryPointerType( |
| 1041 static_cast<WebSettings::PointerType>(prefs.primary_pointer_type)); |
| 1042 settings->setAvailableHoverTypes(prefs.available_hover_types); |
| 1043 settings->setPrimaryHoverType( |
| 1044 static_cast<WebSettings::HoverType>(prefs.primary_hover_type)); |
1039 settings->setDeviceSupportsTouch(prefs.device_supports_touch); | 1045 settings->setDeviceSupportsTouch(prefs.device_supports_touch); |
1040 settings->setDeviceSupportsMouse(prefs.device_supports_mouse); | 1046 settings->setDeviceSupportsMouse(prefs.device_supports_mouse); |
1041 settings->setEnableTouchAdjustment(prefs.touch_adjustment_enabled); | 1047 settings->setEnableTouchAdjustment(prefs.touch_adjustment_enabled); |
1042 | 1048 |
1043 settings->setDeferredImageDecodingEnabled( | 1049 settings->setDeferredImageDecodingEnabled( |
1044 prefs.deferred_image_decoding_enabled); | 1050 prefs.deferred_image_decoding_enabled); |
1045 settings->setShouldRespectImageOrientation( | 1051 settings->setShouldRespectImageOrientation( |
1046 prefs.should_respect_image_orientation); | 1052 prefs.should_respect_image_orientation); |
1047 | 1053 |
1048 settings->setUnsafePluginPastingEnabled(false); | 1054 settings->setUnsafePluginPastingEnabled(false); |
(...skipping 3165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4214 std::vector<gfx::Size> sizes; | 4220 std::vector<gfx::Size> sizes; |
4215 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4221 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
4216 if (!url.isEmpty()) | 4222 if (!url.isEmpty()) |
4217 urls.push_back( | 4223 urls.push_back( |
4218 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4224 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
4219 } | 4225 } |
4220 SendUpdateFaviconURL(urls); | 4226 SendUpdateFaviconURL(urls); |
4221 } | 4227 } |
4222 | 4228 |
4223 } // namespace content | 4229 } // namespace content |
OLD | NEW |