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

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: 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:
View side-by-side diff with in-line comments
Download patch
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;
}

Powered by Google App Engine
This is Rietveld 408576698