| 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 #include <memory> | 9 #include <memory> |
| 10 | 10 |
| (...skipping 1155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1166 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); | 1166 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); |
| 1167 | 1167 |
| 1168 settings->setShowContextMenuOnMouseUp(prefs.context_menu_on_mouse_up); | 1168 settings->setShowContextMenuOnMouseUp(prefs.context_menu_on_mouse_up); |
| 1169 settings->setAlwaysShowContextMenuOnTouch( | 1169 settings->setAlwaysShowContextMenuOnTouch( |
| 1170 prefs.always_show_context_menu_on_touch); | 1170 prefs.always_show_context_menu_on_touch); |
| 1171 | 1171 |
| 1172 #if defined(OS_MACOSX) | 1172 #if defined(OS_MACOSX) |
| 1173 settings->setDoubleTapToZoomEnabled(true); | 1173 settings->setDoubleTapToZoomEnabled(true); |
| 1174 web_view->setMaximumLegibleScale(prefs.default_maximum_page_scale_factor); | 1174 web_view->setMaximumLegibleScale(prefs.default_maximum_page_scale_factor); |
| 1175 #endif | 1175 #endif |
| 1176 |
| 1177 #if defined(OS_WIN) |
| 1178 WebRuntimeFeatures::enableMiddleClickAutoscroll(true); |
| 1179 #endif |
| 1176 } | 1180 } |
| 1177 | 1181 |
| 1178 /*static*/ | 1182 /*static*/ |
| 1179 RenderViewImpl* RenderViewImpl::Create(CompositorDependencies* compositor_deps, | 1183 RenderViewImpl* RenderViewImpl::Create(CompositorDependencies* compositor_deps, |
| 1180 const ViewMsg_New_Params& params, | 1184 const ViewMsg_New_Params& params, |
| 1181 bool was_created_by_renderer) { | 1185 bool was_created_by_renderer) { |
| 1182 DCHECK(params.view_id != MSG_ROUTING_NONE); | 1186 DCHECK(params.view_id != MSG_ROUTING_NONE); |
| 1183 RenderViewImpl* render_view = NULL; | 1187 RenderViewImpl* render_view = NULL; |
| 1184 if (g_create_render_view_impl) | 1188 if (g_create_render_view_impl) |
| 1185 render_view = g_create_render_view_impl(compositor_deps, params); | 1189 render_view = g_create_render_view_impl(compositor_deps, params); |
| (...skipping 1870 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3056 return render_frame->focused_pepper_plugin(); | 3060 return render_frame->focused_pepper_plugin(); |
| 3057 } | 3061 } |
| 3058 frame = frame->traverseNext(false); | 3062 frame = frame->traverseNext(false); |
| 3059 } | 3063 } |
| 3060 | 3064 |
| 3061 return nullptr; | 3065 return nullptr; |
| 3062 } | 3066 } |
| 3063 #endif | 3067 #endif |
| 3064 | 3068 |
| 3065 } // namespace content | 3069 } // namespace content |
| OLD | NEW |