Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2148)

Unified Diff: chrome/browser/android/vr_shell/vr_shell.h

Issue 2879973002: Expose Gamepad API instance for Cardboard button (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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_;

Powered by Google App Engine
This is Rietveld 408576698