| 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 1102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1113 #endif | 1113 #endif |
| 1114 | 1114 |
| 1115 WebNetworkStateNotifier::setOnLine(prefs.is_online); | 1115 WebNetworkStateNotifier::setOnLine(prefs.is_online); |
| 1116 WebNetworkStateNotifier::setWebConnectionType( | 1116 WebNetworkStateNotifier::setWebConnectionType( |
| 1117 NetConnectionTypeToWebConnectionType(prefs.connection_type)); | 1117 NetConnectionTypeToWebConnectionType(prefs.connection_type)); |
| 1118 settings->setPinchVirtualViewportEnabled( | 1118 settings->setPinchVirtualViewportEnabled( |
| 1119 prefs.pinch_virtual_viewport_enabled); | 1119 prefs.pinch_virtual_viewport_enabled); |
| 1120 | 1120 |
| 1121 settings->setPinchOverlayScrollbarThickness( | 1121 settings->setPinchOverlayScrollbarThickness( |
| 1122 prefs.pinch_overlay_scrollbar_thickness); | 1122 prefs.pinch_overlay_scrollbar_thickness); |
| 1123 settings->setRubberBandingOnCompositorThread( | |
| 1124 prefs.rubber_banding_on_compositor_thread); | |
| 1125 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); | 1123 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); |
| 1126 | 1124 |
| 1127 settings->setShowContextMenuOnMouseUp(prefs.context_menu_on_mouse_up); | 1125 settings->setShowContextMenuOnMouseUp(prefs.context_menu_on_mouse_up); |
| 1128 | 1126 |
| 1129 #if defined(OS_MACOSX) | 1127 #if defined(OS_MACOSX) |
| 1130 settings->setDoubleTapToZoomEnabled(true); | 1128 settings->setDoubleTapToZoomEnabled(true); |
| 1131 web_view->setMaximumLegibleScale(prefs.default_maximum_page_scale_factor); | 1129 web_view->setMaximumLegibleScale(prefs.default_maximum_page_scale_factor); |
| 1132 #endif | 1130 #endif |
| 1133 } | 1131 } |
| 1134 | 1132 |
| (...skipping 2864 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3999 std::vector<gfx::Size> sizes; | 3997 std::vector<gfx::Size> sizes; |
| 4000 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 3998 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 4001 if (!url.isEmpty()) | 3999 if (!url.isEmpty()) |
| 4002 urls.push_back( | 4000 urls.push_back( |
| 4003 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4001 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 4004 } | 4002 } |
| 4005 SendUpdateFaviconURL(urls); | 4003 SendUpdateFaviconURL(urls); |
| 4006 } | 4004 } |
| 4007 | 4005 |
| 4008 } // namespace content | 4006 } // namespace content |
| OLD | NEW |