Chromium Code Reviews| 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 1139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1150 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); | 1150 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); |
| 1151 | 1151 |
| 1152 settings->setShowContextMenuOnMouseUp(prefs.context_menu_on_mouse_up); | 1152 settings->setShowContextMenuOnMouseUp(prefs.context_menu_on_mouse_up); |
| 1153 settings->setAlwaysShowContextMenuOnTouch( | 1153 settings->setAlwaysShowContextMenuOnTouch( |
| 1154 prefs.always_show_context_menu_on_touch); | 1154 prefs.always_show_context_menu_on_touch); |
| 1155 | 1155 |
| 1156 #if defined(OS_MACOSX) | 1156 #if defined(OS_MACOSX) |
| 1157 settings->setDoubleTapToZoomEnabled(true); | 1157 settings->setDoubleTapToZoomEnabled(true); |
| 1158 web_view->setMaximumLegibleScale(prefs.default_maximum_page_scale_factor); | 1158 web_view->setMaximumLegibleScale(prefs.default_maximum_page_scale_factor); |
| 1159 #endif | 1159 #endif |
| 1160 | |
| 1161 settings->setWheelGesturesEnabled(UseGestureBasedWheelScrolling()); | |
|
bokan
2016/06/08 15:26:51
Should we remove UseGestureBasedWheelScrolling() a
dtapuska
2016/06/08 15:36:04
separate patch.
| |
| 1162 } | 1160 } |
| 1163 | 1161 |
| 1164 /*static*/ | 1162 /*static*/ |
| 1165 RenderViewImpl* RenderViewImpl::Create(CompositorDependencies* compositor_deps, | 1163 RenderViewImpl* RenderViewImpl::Create(CompositorDependencies* compositor_deps, |
| 1166 const ViewMsg_New_Params& params, | 1164 const ViewMsg_New_Params& params, |
| 1167 bool was_created_by_renderer) { | 1165 bool was_created_by_renderer) { |
| 1168 DCHECK(params.view_id != MSG_ROUTING_NONE); | 1166 DCHECK(params.view_id != MSG_ROUTING_NONE); |
| 1169 RenderViewImpl* render_view = NULL; | 1167 RenderViewImpl* render_view = NULL; |
| 1170 if (g_create_render_view_impl) | 1168 if (g_create_render_view_impl) |
| 1171 render_view = g_create_render_view_impl(compositor_deps, params); | 1169 render_view = g_create_render_view_impl(compositor_deps, params); |
| (...skipping 2223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3395 return render_frame->focused_pepper_plugin(); | 3393 return render_frame->focused_pepper_plugin(); |
| 3396 } | 3394 } |
| 3397 frame = frame->traverseNext(false); | 3395 frame = frame->traverseNext(false); |
| 3398 } | 3396 } |
| 3399 | 3397 |
| 3400 return nullptr; | 3398 return nullptr; |
| 3401 } | 3399 } |
| 3402 #endif | 3400 #endif |
| 3403 | 3401 |
| 3404 } // namespace content | 3402 } // namespace content |
| OLD | NEW |