device/vr/android/gvr/gvr_gamepad_data_fetcher.h - Issue 2377763003: Revert "Updated to GVR 1.0 SDK"

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: device/vr/android/gvr/gvr_gamepad_data_fetcher.h

Issue 2377763003: Revert "Updated to GVR 1.0 SDK" (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:

View unified diff | Download patch

« no previous file with comments | « device/vr/android/gvr/gvr_device_provider.cc ('k') | device/vr/android/gvr/gvr_gamepad_data_fetcher.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef DEVICE_VR_ANDROID_GVR_GAMEPAD_DATA_FETCHER_H_	5 #ifndef DEVICE_VR_ANDROID_GVR_GAMEPAD_DATA_FETCHER_H_

6 #define DEVICE_VR_ANDROID_GVR_GAMEPAD_DATA_FETCHER_H_	6 #define DEVICE_VR_ANDROID_GVR_GAMEPAD_DATA_FETCHER_H_

7	7

8 #include <string>	8 #include <string>

9	9

10 #include "device/gamepad/gamepad_data_fetcher.h"	10 #include "device/gamepad/gamepad_data_fetcher.h"

11 #include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_co ntroller.h"	11 #include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/g vr_controller.h"

12 #include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_ty pes.h"	12 #include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/g vr_types.h"

13	13

14 namespace device {	14 namespace device {

15	15

16 class GvrDelegate;	16 class GvrDelegate;

17	17

18 class GvrGamepadDataFetcher : public GamepadDataFetcher {	18 class GvrGamepadDataFetcher : public GamepadDataFetcher {

19 public:	19 public:

20 class Factory : public GamepadDataFetcherFactory {	20 class Factory : public GamepadDataFetcherFactory {

21 public:	21 public:

22 Factory(GvrDelegate* delegate, unsigned int display_id);	22 Factory(GvrDelegate* delegate, unsigned int display_id);

(...skipping 10 matching lines...) Expand all Loading...
33 ~GvrGamepadDataFetcher() override;	33 ~GvrGamepadDataFetcher() override;

34	34

35 GamepadSource source() override;	35 GamepadSource source() override;

36	36

37 void GetGamepadData(bool devices_changed_hint) override;	37 void GetGamepadData(bool devices_changed_hint) override;

38 void PauseHint(bool paused) override;	38 void PauseHint(bool paused) override;

39 void OnAddedToProvider() override;	39 void OnAddedToProvider() override;

40	40

41 private:	41 private:

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

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

44 gvr::ControllerState controller_state_;	43 gvr::ControllerState controller_state_;

45 unsigned int display_id_;	44 unsigned int display_id_;

46	45

47 DISALLOW_COPY_AND_ASSIGN(GvrGamepadDataFetcher);	46 DISALLOW_COPY_AND_ASSIGN(GvrGamepadDataFetcher);

48 };	47 };

49	48

50 } // namespace device	49 } // namespace device

51 #endif // DEVICE_VR_ANDROID_GVR_GAMEPAD_DATA_FETCHER_H_	50 #endif // DEVICE_VR_ANDROID_GVR_GAMEPAD_DATA_FETCHER_H_

OLD	NEW