summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorscottmg@google.com <scottmg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-17 15:59:57 +0000
committerscottmg@google.com <scottmg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-17 15:59:57 +0000
commitd7a35b794fd12a20a7f879f47ced3c03c1faf962 (patch)
tree0545d3f1a977977c1a82273abebbabc5b1f8bbe6 /content
parent54e26c1249af1c3165587938d9edb0daf4ce4c21 (diff)
downloadchromium_src-d7a35b794fd12a20a7f879f47ced3c03c1faf962.zip
chromium_src-d7a35b794fd12a20a7f879f47ced3c03c1faf962.tar.gz
chromium_src-d7a35b794fd12a20a7f879f47ced3c03c1faf962.tar.bz2
Revert 137239 - Revert 134823 - Enable gamepad API by default
(This re-enables by default, it was only supposed to be off on M20 branch) Turning on by default before M20 branch, but leaving flag code for now so that it's just a one-liner to disable if necessary post-branch. BUG=118552,112879 Review URL: http://codereview.chromium.org/10281003 TBR=scottmg@chromium.org Review URL: https://chromiumcodereview.appspot.com/10310173 TBR=scottmg@google.com Review URL: https://chromiumcodereview.appspot.com/10386191 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137663 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/renderer/render_thread_impl.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 71280bd..3df9f77 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -575,8 +575,7 @@ void RenderThreadImpl::EnsureWebKitInitialized() {
WebRuntimeFeatures::enableJavaScriptI18NAPI(
!command_line.HasSwitch(switches::kDisableJavaScriptI18NAPI));
- WebRuntimeFeatures::enableGamepad(
- command_line.HasSwitch(switches::kEnableGamepad));
+ WebRuntimeFeatures::enableGamepad(true);
WebRuntimeFeatures::enableQuota(true);