Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(286)

Unified Diff: chrome/browser/android/vr_shell/vr_controller.h

Issue 2762003002: Refactor GVR controller gamepad API integration (Closed)
Patch Set: Rebase, no changes Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/android/vr_shell/vr_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « no previous file | chrome/browser/android/vr_shell/vr_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698