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 1115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1126 WebNetworkStateNotifier::setWebConnectionType( | 1126 WebNetworkStateNotifier::setWebConnectionType( |
1127 NetConnectionTypeToWebConnectionType(prefs.connection_type)); | 1127 NetConnectionTypeToWebConnectionType(prefs.connection_type)); |
1128 | 1128 |
1129 settings->setPinchOverlayScrollbarThickness( | 1129 settings->setPinchOverlayScrollbarThickness( |
1130 prefs.pinch_overlay_scrollbar_thickness); | 1130 prefs.pinch_overlay_scrollbar_thickness); |
1131 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); | 1131 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); |
1132 | 1132 |
1133 settings->setShowContextMenuOnMouseUp(prefs.context_menu_on_mouse_up); | 1133 settings->setShowContextMenuOnMouseUp(prefs.context_menu_on_mouse_up); |
1134 | 1134 |
1135 #if defined(OS_MACOSX) | 1135 #if defined(OS_MACOSX) |
| 1136 #if !defined(OS_IOS) |
| 1137 bool is_elastic_overscroll_enabled = |
| 1138 RenderViewImpl::FromWebView(web_view) |
| 1139 ? RenderViewImpl::FromWebView(web_view)->IsElasticOverscrollEnabled() |
| 1140 : false; |
| 1141 settings->setReportWheelOverscroll(is_elastic_overscroll_enabled); |
| 1142 #endif |
1136 settings->setDoubleTapToZoomEnabled(true); | 1143 settings->setDoubleTapToZoomEnabled(true); |
1137 web_view->setMaximumLegibleScale(prefs.default_maximum_page_scale_factor); | 1144 web_view->setMaximumLegibleScale(prefs.default_maximum_page_scale_factor); |
1138 #endif | 1145 #endif |
1139 } | 1146 } |
1140 | 1147 |
1141 /*static*/ | 1148 /*static*/ |
1142 RenderViewImpl* RenderViewImpl::Create(const ViewMsg_New_Params& params, | 1149 RenderViewImpl* RenderViewImpl::Create(const ViewMsg_New_Params& params, |
1143 CompositorDependencies* compositor_deps, | 1150 CompositorDependencies* compositor_deps, |
1144 bool was_created_by_renderer) { | 1151 bool was_created_by_renderer) { |
1145 DCHECK(params.view_id != MSG_ROUTING_NONE); | 1152 DCHECK(params.view_id != MSG_ROUTING_NONE); |
(...skipping 2649 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3795 std::vector<gfx::Size> sizes; | 3802 std::vector<gfx::Size> sizes; |
3796 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 3803 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
3797 if (!url.isEmpty()) | 3804 if (!url.isEmpty()) |
3798 urls.push_back( | 3805 urls.push_back( |
3799 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 3806 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
3800 } | 3807 } |
3801 SendUpdateFaviconURL(urls); | 3808 SendUpdateFaviconURL(urls); |
3802 } | 3809 } |
3803 | 3810 |
3804 } // namespace content | 3811 } // namespace content |
OLD | NEW |