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 1119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1130 settings->setRubberBandingOnCompositorThread( | 1130 settings->setRubberBandingOnCompositorThread( |
1131 prefs.rubber_banding_on_compositor_thread); | 1131 prefs.rubber_banding_on_compositor_thread); |
1132 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); | 1132 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); |
1133 | 1133 |
1134 #if defined(OS_WIN) | 1134 #if defined(OS_WIN) |
1135 settings->setShowContextMenuOnMouseUp(true); | 1135 settings->setShowContextMenuOnMouseUp(true); |
1136 #endif | 1136 #endif |
1137 | 1137 |
1138 #if defined(OS_MACOSX) | 1138 #if defined(OS_MACOSX) |
1139 settings->setDoubleTapToZoomEnabled(true); | 1139 settings->setDoubleTapToZoomEnabled(true); |
| 1140 web_view->setMaximumLegibleScale(prefs.default_maximum_page_scale_factor); |
1140 #endif | 1141 #endif |
1141 } | 1142 } |
1142 | 1143 |
1143 /*static*/ | 1144 /*static*/ |
1144 RenderViewImpl* RenderViewImpl::Create(const ViewMsg_New_Params& params, | 1145 RenderViewImpl* RenderViewImpl::Create(const ViewMsg_New_Params& params, |
1145 CompositorDependencies* compositor_deps, | 1146 CompositorDependencies* compositor_deps, |
1146 bool was_created_by_renderer) { | 1147 bool was_created_by_renderer) { |
1147 DCHECK(params.view_id != MSG_ROUTING_NONE); | 1148 DCHECK(params.view_id != MSG_ROUTING_NONE); |
1148 RenderViewImpl* render_view = NULL; | 1149 RenderViewImpl* render_view = NULL; |
1149 if (g_create_render_view_impl) | 1150 if (g_create_render_view_impl) |
(...skipping 2911 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4061 std::vector<gfx::Size> sizes; | 4062 std::vector<gfx::Size> sizes; |
4062 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4063 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
4063 if (!url.isEmpty()) | 4064 if (!url.isEmpty()) |
4064 urls.push_back( | 4065 urls.push_back( |
4065 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4066 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
4066 } | 4067 } |
4067 SendUpdateFaviconURL(urls); | 4068 SendUpdateFaviconURL(urls); |
4068 } | 4069 } |
4069 | 4070 |
4070 } // namespace content | 4071 } // namespace content |
OLD | NEW |