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 1163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1174 | 1174 |
1175 WebNetworkStateNotifier::setOnLine(prefs.is_online); | 1175 WebNetworkStateNotifier::setOnLine(prefs.is_online); |
1176 WebNetworkStateNotifier::setWebConnectionType( | 1176 WebNetworkStateNotifier::setWebConnectionType( |
1177 NetConnectionTypeToWebConnectionType(prefs.connection_type)); | 1177 NetConnectionTypeToWebConnectionType(prefs.connection_type)); |
1178 settings->setPinchVirtualViewportEnabled( | 1178 settings->setPinchVirtualViewportEnabled( |
1179 prefs.pinch_virtual_viewport_enabled); | 1179 prefs.pinch_virtual_viewport_enabled); |
1180 | 1180 |
1181 settings->setPinchOverlayScrollbarThickness( | 1181 settings->setPinchOverlayScrollbarThickness( |
1182 prefs.pinch_overlay_scrollbar_thickness); | 1182 prefs.pinch_overlay_scrollbar_thickness); |
1183 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); | 1183 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); |
1184 settings->setCompositorTouchHitTesting(prefs.compositor_touch_hit_testing); | |
1185 } | 1184 } |
1186 | 1185 |
1187 /*static*/ | 1186 /*static*/ |
1188 RenderViewImpl* RenderViewImpl::Create( | 1187 RenderViewImpl* RenderViewImpl::Create( |
1189 int32 opener_id, | 1188 int32 opener_id, |
1190 bool window_was_created_with_opener, | 1189 bool window_was_created_with_opener, |
1191 const RendererPreferences& renderer_prefs, | 1190 const RendererPreferences& renderer_prefs, |
1192 const WebPreferences& webkit_prefs, | 1191 const WebPreferences& webkit_prefs, |
1193 int32 routing_id, | 1192 int32 routing_id, |
1194 int32 main_frame_routing_id, | 1193 int32 main_frame_routing_id, |
(...skipping 3075 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4270 std::vector<gfx::Size> sizes; | 4269 std::vector<gfx::Size> sizes; |
4271 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4270 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
4272 if (!url.isEmpty()) | 4271 if (!url.isEmpty()) |
4273 urls.push_back( | 4272 urls.push_back( |
4274 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4273 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
4275 } | 4274 } |
4276 SendUpdateFaviconURL(urls); | 4275 SendUpdateFaviconURL(urls); |
4277 } | 4276 } |
4278 | 4277 |
4279 } // namespace content | 4278 } // namespace content |
OLD | NEW |