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

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

Issue 2762003002: Refactor GVR controller gamepad API integration (Closed)
Patch Set: Fix comment, include gvr_types only for data provider 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 unified diff | Download patch
OLDNEW
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 "device/vr/vr_export.h" 11 #include "device/vr/vr_export.h"
12 #include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/ gvr_controller.h"
13 #include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/ gvr_types.h"
14 12
15 namespace device { 13 namespace device {
16 14
15 class GvrGamepadDataProvider;
16
17 class DEVICE_VR_EXPORT GvrGamepadDataFetcher : public GamepadDataFetcher { 17 class DEVICE_VR_EXPORT GvrGamepadDataFetcher : public GamepadDataFetcher {
18 public: 18 public:
19 class Factory : public GamepadDataFetcherFactory { 19 class Factory : public GamepadDataFetcherFactory {
20 public: 20 public:
21 Factory(gvr_context* context, unsigned int display_id); 21 Factory(GvrGamepadDataProvider*, unsigned int display_id);
22 ~Factory() override; 22 ~Factory() override;
23 std::unique_ptr<GamepadDataFetcher> CreateDataFetcher() override; 23 std::unique_ptr<GamepadDataFetcher> CreateDataFetcher() override;
24 GamepadSource source() override; 24 GamepadSource source() override;
25 25
26 private: 26 private:
27 gvr_context* context_; 27 GvrGamepadDataProvider* data_provider_;
28 unsigned int display_id_; 28 unsigned int display_id_;
29 }; 29 };
30 30
31 GvrGamepadDataFetcher(gvr_context* context, unsigned int display_id); 31 GvrGamepadDataFetcher(GvrGamepadDataProvider*, unsigned int display_id);
32 ~GvrGamepadDataFetcher() override; 32 ~GvrGamepadDataFetcher() override;
33 33
34 GamepadSource source() override; 34 GamepadSource source() override;
35 35
36 void GetGamepadData(bool devices_changed_hint) override; 36 void GetGamepadData(bool devices_changed_hint) override;
37 void PauseHint(bool paused) override; 37 void PauseHint(bool paused) override;
38 void OnAddedToProvider() override; 38 void OnAddedToProvider() override;
39 39
40 private: 40 private:
41 std::unique_ptr<gvr::ControllerApi> controller_api_; 41 GvrGamepadDataProvider* data_provider_;
42 gvr::ControllerState controller_state_;
43 gvr::ControllerHandedness handedness_;
44 unsigned int display_id_; 42 unsigned int display_id_;
45 43
46 DISALLOW_COPY_AND_ASSIGN(GvrGamepadDataFetcher); 44 DISALLOW_COPY_AND_ASSIGN(GvrGamepadDataFetcher);
47 }; 45 };
48 46
49 } // namespace device 47 } // namespace device
50 #endif // DEVICE_VR_ANDROID_GVR_GAMEPAD_DATA_FETCHER_H_ 48 #endif // DEVICE_VR_ANDROID_GVR_GAMEPAD_DATA_FETCHER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698