| 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 1114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1125 WebNetworkStateNotifier::setWebConnectionType( | 1125 WebNetworkStateNotifier::setWebConnectionType( |
| 1126 NetConnectionTypeToWebConnectionType(prefs.connection_type)); | 1126 NetConnectionTypeToWebConnectionType(prefs.connection_type)); |
| 1127 | 1127 |
| 1128 settings->setPinchOverlayScrollbarThickness( | 1128 settings->setPinchOverlayScrollbarThickness( |
| 1129 prefs.pinch_overlay_scrollbar_thickness); | 1129 prefs.pinch_overlay_scrollbar_thickness); |
| 1130 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); | 1130 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); |
| 1131 | 1131 |
| 1132 settings->setShowContextMenuOnMouseUp(prefs.context_menu_on_mouse_up); | 1132 settings->setShowContextMenuOnMouseUp(prefs.context_menu_on_mouse_up); |
| 1133 | 1133 |
| 1134 #if defined(OS_MACOSX) | 1134 #if defined(OS_MACOSX) |
| 1135 #if !defined(OS_IOS) |
| 1136 bool set_elastic_overscroll = |
| 1137 RenderViewImpl::FromWebView(web_view) |
| 1138 ? RenderViewImpl::FromWebView(web_view)->IsElasticOverscrollEnabled() |
| 1139 : false; |
| 1140 settings->setElasticOverscrollEnabled(set_elastic_overscroll); |
| 1141 #endif |
| 1135 settings->setDoubleTapToZoomEnabled(true); | 1142 settings->setDoubleTapToZoomEnabled(true); |
| 1136 web_view->setMaximumLegibleScale(prefs.default_maximum_page_scale_factor); | 1143 web_view->setMaximumLegibleScale(prefs.default_maximum_page_scale_factor); |
| 1137 #endif | 1144 #endif |
| 1138 } | 1145 } |
| 1139 | 1146 |
| 1140 /*static*/ | 1147 /*static*/ |
| 1141 RenderViewImpl* RenderViewImpl::Create(const ViewMsg_New_Params& params, | 1148 RenderViewImpl* RenderViewImpl::Create(const ViewMsg_New_Params& params, |
| 1142 CompositorDependencies* compositor_deps, | 1149 CompositorDependencies* compositor_deps, |
| 1143 bool was_created_by_renderer) { | 1150 bool was_created_by_renderer) { |
| 1144 DCHECK(params.view_id != MSG_ROUTING_NONE); | 1151 DCHECK(params.view_id != MSG_ROUTING_NONE); |
| (...skipping 2650 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 |