device/vr/android/gvr/gvr_gamepad_data_fetcher.h - Issue 2396663002: Reland gvr upgrade

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: device/vr/android/gvr/gvr_gamepad_data_fetcher.h

Issue 2396663002: Reland gvr upgrade (Closed)

Patch Set: Created 4 years, 2 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:

Index: device/vr/android/gvr/gvr_gamepad_data_fetcher.h

diff --git a/device/vr/android/gvr/gvr_gamepad_data_fetcher.h b/device/vr/android/gvr/gvr_gamepad_data_fetcher.h

index f4199d3c61624dfb2f35285b13e2281d3630340a..4c5452fe436772b8f3d07891556877c77c7836e2 100644

--- a/device/vr/android/gvr/gvr_gamepad_data_fetcher.h

+++ b/device/vr/android/gvr/gvr_gamepad_data_fetcher.h

@@ -8,8 +8,8 @@

#include <string>

#include "device/gamepad/gamepad_data_fetcher.h"

-#include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr_controller.h"

-#include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr_types.h"

+#include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_controller.h"

+#include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_types.h"

namespace device {

@@ -40,6 +40,7 @@ class GvrGamepadDataFetcher : public GamepadDataFetcher {

private:

std::unique_ptr<gvr::ControllerApi> controller_api_;

+ std::unique_ptr<gvr::UserPrefs> user_prefs_;

gvr::ControllerState controller_state_;

unsigned int display_id_;