Index: chrome/browser/android/vr_shell/vr_shell.h |
diff --git a/chrome/browser/android/vr_shell/vr_shell.h b/chrome/browser/android/vr_shell/vr_shell.h |
index 79850d36e75d55fa6057267c03232a3548e1110c..63bd5b4c134014a28f8cd44788208b1305efaa89 100644 |
--- a/chrome/browser/android/vr_shell/vr_shell.h |
+++ b/chrome/browser/android/vr_shell/vr_shell.h |
@@ -83,7 +83,8 @@ class VrShell : public device::PresentingGvrDelegate, |
const base::android::JavaParamRef<jobject>& obj); |
void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj); |
void OnTriggerEvent(JNIEnv* env, |
- const base::android::JavaParamRef<jobject>& obj); |
+ const base::android::JavaParamRef<jobject>& obj, |
+ bool touched); |
void OnPause(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj); |
void OnResume(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj); |
void SetSurface(JNIEnv* env, |
@@ -216,7 +217,7 @@ class VrShell : public device::PresentingGvrDelegate, |
bool gamepad_source_active_ = false; |
// Registered fetcher, must remain alive for UpdateGamepadData calls. |
// That's ok since the fetcher is only destroyed from VrShell's destructor. |
- device::GvrGamepadDataFetcher* gamepad_data_fetcher_ = nullptr; |
+ std::vector<device::GvrGamepadDataFetcher*> gamepad_data_fetchers_; |
base::WeakPtrFactory<VrShell> weak_ptr_factory_; |