VR: Refresh controller handedness when resuming the controller.

chrome/browser/android/vr_shell/vr_controller.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/vr_shell/vr_controller.h"
 
 #include <algorithm>
 #include <cmath>
 #include <utility>
 
@@ skipping 41 matching lines @@
 }
 
 float DeltaTimeSeconds(int64_t last_timestamp_nanos) {
   return (gvr::GvrApi::GetTimePointNow().monotonic_system_time_nanos -
           last_timestamp_nanos) /
          kNanoSecondsPerSecond;
 }
 
 }  // namespace
 
-VrController::VrController(gvr_context* vr_context) {
+VrController::VrController(gvr_context* gvr_context) {
   DVLOG(1) << __FUNCTION__ << "=" << this;
-  Initialize(vr_context);
+  CHECK(gvr_context != nullptr) << "invalid gvr_context";
+  controller_api_ = base::MakeUnique<gvr::ControllerApi>();
+  controller_state_ = base::MakeUnique<gvr::ControllerState>();
+  gvr_api_ = gvr::GvrApi::WrapNonOwned(gvr_context);
+
+  int32_t options = gvr::ControllerApi::DefaultOptions();
+
+  // Enable non-default options - WebVR needs gyro and linear acceleration, and
+  // since VrShell implements GvrGamepadDataProvider we need this always.
+  options |= GVR_CONTROLLER_ENABLE_GYRO;
+  options |= GVR_CONTROLLER_ENABLE_ACCEL;
+
+  CHECK(controller_api_->Init(options, gvr_context));
+  controller_api_->Resume();
+
+  handedness_ = gvr_api_->GetUserPrefs().GetControllerHandedness();
   elbow_model_ = base::MakeUnique<ElbowModel>(handedness_);
+
   Reset();
   last_timestamp_nanos_ =
       gvr::GvrApi::GetTimePointNow().monotonic_system_time_nanos;
 }
 
 VrController::~VrController() {
   DVLOG(1) << __FUNCTION__ << "=" << this;
 }
 
 void VrController::OnResume() {
-  if (controller_api_)
+  if (controller_api_) {
     controller_api_->Resume();
+    handedness_ = gvr_api_->GetUserPrefs().GetControllerHandedness();
+    elbow_model_->SetHandedness(handedness_);
+  }
 }
 
 void VrController::OnPause() {
   if (controller_api_)
     controller_api_->Pause();
 }
 
 device::GvrGamepadData VrController::GetGamepadData() {
   device::GvrGamepadData pad;
 
@@ skipping 130 matching lines @@
     if (extrapolated_touch_ == kMaxNumOfExtrapolations) {
       overall_velocity_ = {0, 0};
     }
     extrapolated_touch_ = 0;
   }
   last_touch_timestamp_ = controller_state_->GetLastTouchTimestamp();
   last_timestamp_nanos_ =
       gvr::GvrApi::GetTimePointNow().monotonic_system_time_nanos;
 }
 
-void VrController::Initialize(gvr_context* gvr_context) {
-  CHECK(gvr_context != nullptr) << "invalid gvr_context";
-  controller_api_.reset(new gvr::ControllerApi);
-  controller_state_.reset(new gvr::ControllerState);
-
-  int32_t options = gvr::ControllerApi::DefaultOptions();
-
-  // Enable non-default options - WebVR needs gyro and linear acceleration, and
-  // since VrShell implements GvrGamepadDataProvider we need this always.
-  options |= GVR_CONTROLLER_ENABLE_GYRO;
-  options |= GVR_CONTROLLER_ENABLE_ACCEL;
-
-  CHECK(controller_api_->Init(options, gvr_context));
-
-  std::unique_ptr<gvr::GvrApi> gvr = gvr::GvrApi::WrapNonOwned(gvr_context);
-  // TODO(bajones): Monitor changes to the controller handedness.
-  handedness_ = gvr->GetUserPrefs().GetControllerHandedness();
-
-  controller_api_->Resume();
-}
-
 std::vector<std::unique_ptr<WebGestureEvent>> VrController::DetectGestures() {
   std::vector<std::unique_ptr<WebGestureEvent>> gesture_list;
   std::unique_ptr<WebGestureEvent> gesture(new WebGestureEvent());
 
   if (controller_state_->GetConnectionState() != gvr::kControllerConnected) {
     gesture_list.push_back(std::move(gesture));
     return gesture_list;
   }
 
   touch_position_changed_ = UpdateCurrentTouchpoint();
@@ skipping 182 matching lines @@
 
   const gfx::Vector2dF& velocity = ScaleVector2d(displacement, (1 / duration));
 
   float weight = duration / (kRC + duration);
 
   overall_velocity_ = ScaleVector2d(overall_velocity_, (1 - weight)) +
                       ScaleVector2d(velocity, weight);
 }
 
 }  // namespace vr_shell