summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsudarsana.nagineni@intel.com <sudarsana.nagineni@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-24 21:24:08 +0000
committersudarsana.nagineni@intel.com <sudarsana.nagineni@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-24 21:24:08 +0000
commit5c7fa301276bca5d6cf16d93a7514bed94bab215 (patch)
tree389d1fcb8c8a384024a1f4abebb5f7e78cb2f6b8
parent76cbe549234460026d3454d1de0784e26747a486 (diff)
downloadchromium_src-5c7fa301276bca5d6cf16d93a7514bed94bab215.zip
chromium_src-5c7fa301276bca5d6cf16d93a7514bed94bab215.tar.gz
chromium_src-5c7fa301276bca5d6cf16d93a7514bed94bab215.tar.bz2
Disable the Gamepad API run-time flag for Android.
Gamepad API is not implemented on Android yet, so disabling the run-time flag. BUG= Review URL: https://chromiumcodereview.appspot.com/14241027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196238 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--AUTHORS1
-rw-r--r--content/renderer/render_thread_impl.cc7
2 files changed, 6 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index ceca7d6..00b89b8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -242,3 +242,4 @@ Yael Aharon <yael.aharon@intel.com>
Haojian Wu <hokein.wu@gmail.com>
Sathish Kuppuswamy <sathish.kuppuswamy@intel.com>
Joone Hur <joone.hur@intel.com>
+Sudarsana Babu Nagineni <sudarsana.nagineni@intel.com>
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 1e84cd2..44c9c89 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -750,8 +750,13 @@ void RenderThreadImpl::EnsureWebKitInitialized() {
#if defined(OS_ANDROID)
// Web Speech API Speech recognition is not implemented on Android yet.
WebRuntimeFeatures::enableScriptedSpeech(false);
+
+ // Android does not support the Gamepad API.
+ WebRuntimeFeatures::enableGamepad(false);
#else
WebRuntimeFeatures::enableScriptedSpeech(true);
+
+ WebRuntimeFeatures::enableGamepad(true);
#endif
#if defined(OS_ANDROID)
@@ -765,8 +770,6 @@ void RenderThreadImpl::EnsureWebKitInitialized() {
WebRuntimeFeatures::enableJavaScriptI18NAPI(
!command_line.HasSwitch(switches::kDisableJavaScriptI18NAPI));
- WebRuntimeFeatures::enableGamepad(true);
-
WebRuntimeFeatures::enableQuota(true);
WebRuntimeFeatures::enableShadowDOM(true);