Refactor GVR controller gamepad API integration

chrome/browser/android/vr_shell/vr_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_CONTROLLER_H_
 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_CONTROLLER_H_
 
 #include <memory>
 #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"
 
 using blink::WebGestureEvent;
 using blink::WebInputEvent;
 
 namespace gvr {
 class ControllerState;
 }
 
 namespace vr_shell {
 
 class VrController {
  public:
   // Controller API entry point.
   explicit VrController(gvr_context* gvr_context);
   ~VrController();
 
   // Must be called when the Activity gets OnResume().
   void OnResume();
 
   // 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().
   void UpdateState();
 
   std::vector<std::unique_ptr<WebGestureEvent>> DetectGestures();
 
   bool IsTouching();
 
   float TouchPosX();
 
   float TouchPosY();
@@ skipping 73 matching lines @@
   std::unique_ptr<gvr::ControllerApi> controller_api_;
 
   // The last controller state (updated once per frame).
   std::unique_ptr<gvr::ControllerState> controller_state_;
 
   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)
+  gvr::ControllerHandedness handedness_;
+
   // Current touch info after the extrapolation.
   std::unique_ptr<TouchInfo> touch_info_;
 
   // A pointer storing the touch point from previous frame.
   std::unique_ptr<TouchPoint> prev_touch_point_;
 
   // A pointer storing the touch point from current frame.
   std::unique_ptr<TouchPoint> cur_touch_point_;
 
   // Initial touch point.
@@ skipping 13 matching lines @@
 
   // Number of consecutively extrapolated touch points
   int extrapolated_touch_ = 0;
 
   DISALLOW_COPY_AND_ASSIGN(VrController);
 };
 
 }  // namespace vr_shell
 
 #endif  // CHROME_BROWSER_ANDROID_VR_SHELL_VR_CONTROLLER_H_