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