content/renderer/gpu/render_widget_compositor.cc - Issue 12722002: Enable pinch & scrollbars by default for CrOS.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/gpu/render_widget_compositor.cc

Issue 12722002: Enable pinch & scrollbars by default for CrOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased. Created 7 years, 9 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:

Index: content/renderer/gpu/render_widget_compositor.cc

diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc

index 438831ac07c9ca350dfa2da0bff6f4f336a8a030..40ba0c9b257d6db47abacc698d338e2995d7e23d 100644

--- a/content/renderer/gpu/render_widget_compositor.cc

+++ b/content/renderer/gpu/render_widget_compositor.cc

@@ -178,6 +178,13 @@ scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create(

settings.showOverdrawInTracing =

cmd->HasSwitch(cc::switches::kTraceOverdraw);

+#if defined(OS_CHROMEOS)

+ settings.usePinchZoomScrollbars =

+ !cmd->HasSwitch(cc::switches::kDisablePinchZoomScrollbars);

+#elif defined(OS_WIN) || defined(OS_LINUX)

+ settings.usePinchZoomScrollbars =

+ cmd->HasSwitch(cc::switches::kEnablePinchZoomScrollbars);

+#endif

settings.initialDebugState.showFPSCounter =

cmd->HasSwitch(switches::kShowFPSCounter);

settings.initialDebugState.showPaintRects =