| Index: chrome/browser/android/vr_shell/vr_controller.h
|
| diff --git a/chrome/browser/android/vr_shell/vr_controller.h b/chrome/browser/android/vr_shell/vr_controller.h
|
| index 8e70fd139a70d9618efe9ac606e49f6fb3a09197..b8b878590162ebd29b8313eefb973bea9de54e85 100644
|
| --- a/chrome/browser/android/vr_shell/vr_controller.h
|
| +++ b/chrome/browser/android/vr_shell/vr_controller.h
|
| @@ -9,6 +9,7 @@
|
| #include <vector>
|
|
|
| #include "base/macros.h"
|
| +#include "device/vr/android/gvr/gvr_gamepad_data_provider.h"
|
| #include "third_party/WebKit/public/platform/WebGestureEvent.h"
|
| #include "third_party/WebKit/public/platform/WebInputEvent.h"
|
| #include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/gvr_types.h"
|
| @@ -37,6 +38,8 @@ class VrController {
|
| // Must be called when the GL renderer gets OnSurfaceCreated().
|
| void Initialize(gvr_context* gvr_context);
|
|
|
| + device::GvrGamepadData GetGamepadData();
|
| +
|
| // Must be called when the GL renderer gets OnDrawFrame().
|
| void UpdateState();
|
|
|
| @@ -130,6 +133,9 @@ class VrController {
|
| bool zoom_in_progress_ = false;
|
| bool touch_position_changed_ = false;
|
|
|
| + // Handedness from user prefs (currently only read once on initialization)
|
| + gvr::ControllerHandedness handedness_;
|
| +
|
| // Current touch info after the extrapolation.
|
| std::unique_ptr<TouchInfo> touch_info_;
|
|
|
|
|