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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/android/vr_shell/vr_controller.cc

Issue 2879973002: Expose Gamepad API instance for Cardboard button (Closed)
Patch Set: rebase 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
« chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java ('k') | chrome/browser/android/vr_shell/vr_shell.h » ('j') | chrome/browser/android/vr_shell/vr_shell.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/vr_shell/vr_controller.cc
diff --git a/chrome/browser/android/vr_shell/vr_controller.cc b/chrome/browser/android/vr_shell/vr_controller.cc
index ea1c1ea3eeaa013f83c8c7d4073fd01fd0e8571f..0f4a49acc004e10837c2dc9005e565b819db73a8 100644
--- a/chrome/browser/android/vr_shell/vr_controller.cc
+++ b/chrome/browser/android/vr_shell/vr_controller.cc
@@ -121,7 +121,7 @@ device::GvrGamepadData VrController::GetGamepadData() {
pad.gyro =
vr::MatrixVectorMul(pose_mat, gfx::Vector3dF(gyro.x, gyro.y, gyro.z));
- pad.is_touching = controller_state_->IsTouching();
+ pad.is_controller_touching = controller_state_->IsTouching();
pad.controller_button_pressed =
controller_state_->GetButtonState(GVR_CONTROLLER_BUTTON_CLICK);
pad.right_handed = handedness_ == GVR_CONTROLLER_RIGHT_HANDED;
« chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java ('k') | chrome/browser/android/vr_shell/vr_shell.h » ('j') | chrome/browser/android/vr_shell/vr_shell.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698