content/browser/renderer_host/render_widget_host_view_aura.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/browser/renderer_host/render_widget_host_view_aura.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/browser/renderer_host/render_widget_host_view_aura.cc

diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc

index 475d48912d6ef98af21d263c63546ad9279aa7db..bb13295f5917736783cdb86f4c2a75190db9e612 100644

--- a/content/browser/renderer_host/render_widget_host_view_aura.cc

+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc

@@ -260,7 +260,11 @@ void GetScreenInfoForWindow(WebScreenInfo* results, aura::Window* window) {

bool ShouldSendPinchGesture() {

static bool pinch_allowed =

CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableViewport) ||

+#if defined(OS_CHROMEOS)

+ !CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisablePinch);

+#else

CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnablePinch);

+#endif

return pinch_allowed;

}