Chromium Code Reviews| 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 1837b884cc58f59d80331f350fc4c987a9925632..215d21acd3958bdd2de2c2ab96d1014116cbdcde 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, |
| @@ -231,7 +232,7 @@ class VrShell : public device::PresentingGvrDelegate, |
| bool gamepad_source_active_ = false; |
| // Registered fetcher, must remain alive for UpdateGamepadData calls. |
|
mthiesse
2017/05/16 00:44:37
nit: fetchers
|
| // 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_; |