Expose Gamepad API instance for Cardboard button

chrome/browser/android/vr_shell/vr_shell.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/vr_shell/vr_shell.h"
 
 #include <android/native_window_jni.h>
 
 #include <string>
 #include <utility>
@@ skipping 228 matching lines @@
     delegate_provider_->device_provider()->Device()->OnBlur();
   else
     delegate_provider_->device_provider()->Device()->OnFocus();
 }
 
 void VrShell::NavigateBack() {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_VrShellImpl_navigateBack(env, j_vr_shell_.obj());
 }
 
-void VrShell::OnTriggerEvent(JNIEnv* env, const JavaParamRef<jobject>& obj) {
+void VrShell::OnTriggerEvent(JNIEnv* env,
+                             const JavaParamRef<jobject>& obj,
+                             bool touched) {
   gl_thread_->task_runner()->PostTask(
-      FROM_HERE,
-      base::Bind(&VrShellGl::OnTriggerEvent, gl_thread_->GetVrShellGl()));
+      FROM_HERE, base::Bind(&VrShellGl::OnTriggerEvent,
+                            gl_thread_->GetVrShellGl(), touched));
 }
 
 void VrShell::OnPause(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   gl_thread_->task_runner()->PostTask(
       FROM_HERE, base::Bind(&VrShellGl::OnPause, gl_thread_->GetVrShellGl()));
 
   // exit vr session
   if (metrics_helper_)
     metrics_helper_->SetVRActive(false);
   SetIsInVR(web_contents_, false);
@@ skipping 323 matching lines @@
   }
 }
 
 void VrShell::UpdateGamepadData(device::GvrGamepadData pad) {
   if (!gamepad_source_active_) {
     if (!delegate_provider_->device_provider())
       return;
 
     unsigned int device_id =
         delegate_provider_->device_provider()->Device()->id();
+
+    // Two gamepad factories: one for screen only, and one for controller.
     device::GamepadDataFetcherManager::GetInstance()->AddFactory(
-        new device::GvrGamepadDataFetcher::Factory(this, device_id));
+        new device::GvrGamepadDataFetcher::Factory(this, device_id, true));
+
+    device::GamepadDataFetcherManager::GetInstance()->AddFactory(

[mthiesse, 2017/05/16 00:44:37]

sidenote, gamepad API is scary :P Add twice, remove once, and magically
everything is fine.

+        new device::GvrGamepadDataFetcher::Factory(this, device_id, false));
     gamepad_source_active_ = true;
   }
-  if (gamepad_data_fetcher_) {
-    gamepad_data_fetcher_->SetGamepadData(pad);
+  for (auto* fetcher : gamepad_data_fetchers_) {
+    fetcher->SetGamepadData(pad);
   }
 }
 
 void VrShell::RegisterGamepadDataFetcher(
     device::GvrGamepadDataFetcher* fetcher) {
   DVLOG(1) << __FUNCTION__ << "(" << fetcher << ")";
-  gamepad_data_fetcher_ = fetcher;
+  gamepad_data_fetchers_.push_back(fetcher);
 }
 
 // ----------------------------------------------------------------------------
 // Native JNI methods
 // ----------------------------------------------------------------------------
 
 jlong Init(JNIEnv* env,
            const JavaParamRef<jobject>& obj,
            const JavaParamRef<jobject>& delegate,
            jlong window_android,
            jboolean for_web_vr,
            jboolean in_cct,
            jlong gvr_api,
            jboolean reprojected_rendering) {
   return reinterpret_cast<intptr_t>(new VrShell(
       env, obj, reinterpret_cast<ui::WindowAndroid*>(window_android),
       for_web_vr, in_cct,
       VrShellDelegate::GetNativeVrShellDelegate(env, delegate),
       reinterpret_cast<gvr_context*>(gvr_api), reprojected_rendering));
 }
 
 }  // namespace vr_shell