| 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 d3afda8513b8175f875e1b821eb8a4ecd6b454f0..7f6693e80911a731b1d852d1deed946ee55b0b02 100644
|
| --- a/chrome/browser/android/vr_shell/vr_controller.h
|
| +++ b/chrome/browser/android/vr_shell/vr_controller.h
|
| @@ -42,9 +42,6 @@ class VrController {
|
| // Must be called when the Activity gets OnPause().
|
| void OnPause();
|
|
|
| - // 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().
|
| @@ -141,12 +138,14 @@ class VrController {
|
| // The last controller state (updated once per frame).
|
| std::unique_ptr<gvr::ControllerState> controller_state_;
|
|
|
| + std::unique_ptr<gvr::GvrApi> gvr_api_;
|
| +
|
| float last_qx_;
|
| bool pinch_started_;
|
| bool zoom_in_progress_ = false;
|
| bool touch_position_changed_ = false;
|
|
|
| - // Handedness from user prefs (currently only read once on initialization)
|
| + // Handedness from user prefs.
|
| gvr::ControllerHandedness handedness_;
|
|
|
| // Current touch info after the extrapolation.
|
|
|