Updated to GVR 1.0 SDK

device/vr/android/gvr/gvr_gamepad_data_fetcher.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 "device/vr/android/gvr/gvr_gamepad_data_fetcher.h"
 
 #include "base/strings/utf_string_conversions.h"
 
 #include "device/vr/android/gvr/gvr_delegate.h"
 #include "third_party/WebKit/public/platform/WebGamepads.h"
@@ skipping 36 matching lines @@
 GvrGamepadDataFetcher::GvrGamepadDataFetcher(GvrDelegate* delegate,
                                              unsigned int display_id)
     : display_id_(display_id) {
   gvr::GvrApi* gvr_api = delegate->gvr_api();
   controller_api_.reset(new gvr::ControllerApi());
   int32_t options = gvr::ControllerApi::DefaultOptions();
   options |= GVR_CONTROLLER_ENABLE_GYRO;
   bool success = controller_api_->Init(options, gvr_api->GetContext());
   if (!success)
     controller_api_.reset(nullptr);
+
+  user_prefs_.reset(new gvr::UserPrefs(gvr_api->GetUserPrefs().cobj()));
 }
 
 GvrGamepadDataFetcher::~GvrGamepadDataFetcher() {}
 
 GamepadSource GvrGamepadDataFetcher::source() {
   return GAMEPAD_SOURCE_GVR;
 }
 
 void GvrGamepadDataFetcher::OnAddedToProvider() {
   PauseHint(false);
@@ skipping 20 matching lines @@
     pad.axesLength = 2;
 
     pad.displayId = display_id_;
   }
 
   controller_state_.Update(*controller_api_);
 
   pad.timestamp = controller_state_.GetLastOrientationTimestamp();
 
   // TODO: Query from API if avaialable.
-  pad.hand = GamepadHandRight;
+  gvr::ControllerHandedness handedness = user_prefs_->GetControllerHandedness();
+  pad.hand = (handedness == GVR_CONTROLLER_RIGHT_HANDED) ? GamepadHandRight
+                                                         : GamepadHandLeft;
 
   if (controller_state_.IsTouching()) {
     gvr_vec2f touch_position = controller_state_.GetTouchPos();
     pad.axes[0] = (touch_position.x * 2.0f) - 1.0f;
     pad.axes[1] = (touch_position.y * 2.0f) - 1.0f;
   } else {
     pad.axes[0] = 0.0f;
     pad.axes[1] = 0.0f;
   }
 
@@ skipping 31 matching lines @@
     return;
 
   if (paused) {
     controller_api_->Pause();
   } else {
     controller_api_->Resume();
   }
 }
 
 }  // namespace device