Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(974)

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 2289213002: Implement Middle Click Autoscroll on all platforms not just Windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge branch 'master' of https://chromium.googlesource.com/chromium/src into panscroll Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/NeverFixTests » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1152 matching lines...) Expand 10 before | Expand all | Expand 10 after
1163 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); 1163 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars);
1164 1164
1165 settings->setShowContextMenuOnMouseUp(prefs.context_menu_on_mouse_up); 1165 settings->setShowContextMenuOnMouseUp(prefs.context_menu_on_mouse_up);
1166 settings->setAlwaysShowContextMenuOnTouch( 1166 settings->setAlwaysShowContextMenuOnTouch(
1167 prefs.always_show_context_menu_on_touch); 1167 prefs.always_show_context_menu_on_touch);
1168 1168
1169 #if defined(OS_MACOSX) 1169 #if defined(OS_MACOSX)
1170 settings->setDoubleTapToZoomEnabled(true); 1170 settings->setDoubleTapToZoomEnabled(true);
1171 web_view->setMaximumLegibleScale(prefs.default_maximum_page_scale_factor); 1171 web_view->setMaximumLegibleScale(prefs.default_maximum_page_scale_factor);
1172 #endif 1172 #endif
1173
1174 #if defined(OS_WIN)
1175 WebRuntimeFeatures::enableMiddleClickAutoscroll(true);
1176 #endif
1173 } 1177 }
1174 1178
1175 /*static*/ 1179 /*static*/
1176 RenderViewImpl* RenderViewImpl::Create(CompositorDependencies* compositor_deps, 1180 RenderViewImpl* RenderViewImpl::Create(CompositorDependencies* compositor_deps,
1177 const ViewMsg_New_Params& params, 1181 const ViewMsg_New_Params& params,
1178 bool was_created_by_renderer) { 1182 bool was_created_by_renderer) {
1179 DCHECK(params.view_id != MSG_ROUTING_NONE); 1183 DCHECK(params.view_id != MSG_ROUTING_NONE);
1180 RenderViewImpl* render_view = NULL; 1184 RenderViewImpl* render_view = NULL;
1181 if (g_create_render_view_impl) 1185 if (g_create_render_view_impl)
1182 render_view = g_create_render_view_impl(compositor_deps, params); 1186 render_view = g_create_render_view_impl(compositor_deps, params);
(...skipping 1866 matching lines...) Expand 10 before | Expand all | Expand 10 after
3049 return render_frame->focused_pepper_plugin(); 3053 return render_frame->focused_pepper_plugin();
3050 } 3054 }
3051 frame = frame->traverseNext(false); 3055 frame = frame->traverseNext(false);
3052 } 3056 }
3053 3057
3054 return nullptr; 3058 return nullptr;
3055 } 3059 }
3056 #endif 3060 #endif
3057 3061
3058 } // namespace content 3062 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/NeverFixTests » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698