Create a command-line switch for enabling touch events.

BUG=36415
TEST=none

Review URL: http://codereview.chromium.org/1575033

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46068 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 9 insertions, 0 deletions

diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index f54afd9..3469d80 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -556,6 +556,7 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer(
     switches::kEnableOpenMax,
     switches::kEnableVideoLayering,
     switches::kEnableVideoLogging,
+    switches::kEnableTouch,
     // We propagate the Chrome Frame command line here as well in case the
     // renderer is not run in the sandbox.
     switches::kChromeFrame,
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 2fc46ef..95c866e 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -319,6 +319,9 @@ const char kEnableSyncThemes[]              = "enable-sync-themes";
 // Enable syncing browser typed urls.
 const char kEnableSyncTypedUrls[]           = "enable-sync-typed-urls";
 
+// Whether or not the touch events API is exposed.
+const char kEnableTouch[]                   = "enable-touch";
+
 // Whether the multiple profiles feature based on the user-data-dir flag is
 // enabled or not.
 const char kEnableUserDataDirProfiles[]     = "enable-udd-profiles";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index ba94b41..85bc3a3 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -106,6 +106,7 @@ extern const char kEnableSyncBookmarks[];
 extern const char kEnableSyncPreferences[];
 extern const char kEnableSyncThemes[];
 extern const char kEnableSyncTypedUrls[];
+extern const char kEnableTouch[];
 extern const char kEnableUserDataDirProfiles[];
 extern const char kEnableVerticalTabs[];
 extern const char kEnableVideoLayering[];
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index ce746e4..bccacf6 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -889,6 +889,9 @@ void RenderThread::EnsureWebKitInitialized() {
       command_line.HasSwitch(switches::kEnableExperimentalWebGL));
 
   WebRuntimeFeatures::enablePushState(true);
+
+  WebRuntimeFeatures::enableTouch(
+      command_line.HasSwitch(switches::kEnableTouch));
 }
 
 void RenderThread::IdleHandler() {
diff --git a/webkit/tools/test_shell/test_shell_webkit_init.h b/webkit/tools/test_shell/test_shell_webkit_init.h
index 5416e76..bf0a8ad 100644
--- a/webkit/tools/test_shell/test_shell_webkit_init.h
+++ b/webkit/tools/test_shell/test_shell_webkit_init.h
@@ -64,6 +64,7 @@ class TestShellWebKitInit : public webkit_glue::WebKitClientImpl {
     WebKit::WebRuntimeFeatures::enableWebGL(true);
     WebKit::WebRuntimeFeatures::enablePushState(true);
     WebKit::WebRuntimeFeatures::enableNotifications(true);
+    WebKit::WebRuntimeFeatures::enableTouch(true);
 
     // Load libraries for media and enable the media player.
     FilePath module_path;