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

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

Issue 2471433002: Implement WebVR presentation pausing for VR Shell Menu Mode (Closed)
Patch Set: Address Comments Created 4 years, 1 month 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 "base/memory/weak_ptr.h"
10 #include "device/gamepad/gamepad_data_fetcher.h" 11 #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" 12 #include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_co ntroller.h"
12 #include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_ty pes.h" 13 #include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_ty pes.h"
13 14
14 namespace device { 15 namespace device {
15 16
16 class GvrDelegate; 17 class GvrDelegate;
17 18
18 class GvrGamepadDataFetcher : public GamepadDataFetcher { 19 class GvrGamepadDataFetcher : public GamepadDataFetcher {
19 public: 20 public:
20 class Factory : public GamepadDataFetcherFactory { 21 class Factory : public GamepadDataFetcherFactory {
21 public: 22 public:
22 Factory(GvrDelegate* delegate, unsigned int display_id); 23 Factory(base::WeakPtr<GvrDelegate> delegate, unsigned int display_id);
dcheng 2016/11/12 02:03:31 Nit: const base::WeakPtr<>&
mthiesse 2016/11/14 16:41:38 Done.
23 ~Factory() override; 24 ~Factory() override;
24 std::unique_ptr<GamepadDataFetcher> CreateDataFetcher() override; 25 std::unique_ptr<GamepadDataFetcher> CreateDataFetcher() override;
25 GamepadSource source() override; 26 GamepadSource source() override;
26 27
27 private: 28 private:
28 GvrDelegate* delegate_; 29 base::WeakPtr<GvrDelegate> delegate_;
29 unsigned int display_id_; 30 unsigned int display_id_;
30 }; 31 };
31 32
32 GvrGamepadDataFetcher(GvrDelegate* delegate, unsigned int display_id); 33 GvrGamepadDataFetcher(GvrDelegate* delegate, unsigned int display_id);
33 ~GvrGamepadDataFetcher() override; 34 ~GvrGamepadDataFetcher() override;
34 35
35 GamepadSource source() override; 36 GamepadSource source() override;
36 37
37 void GetGamepadData(bool devices_changed_hint) override; 38 void GetGamepadData(bool devices_changed_hint) override;
38 void PauseHint(bool paused) override; 39 void PauseHint(bool paused) override;
39 void OnAddedToProvider() override; 40 void OnAddedToProvider() override;
40 41
41 private: 42 private:
42 std::unique_ptr<gvr::ControllerApi> controller_api_; 43 std::unique_ptr<gvr::ControllerApi> controller_api_;
43 std::unique_ptr<gvr::UserPrefs> user_prefs_; 44 std::unique_ptr<gvr::UserPrefs> user_prefs_;
44 gvr::ControllerState controller_state_; 45 gvr::ControllerState controller_state_;
45 unsigned int display_id_; 46 unsigned int display_id_;
46 47
47 DISALLOW_COPY_AND_ASSIGN(GvrGamepadDataFetcher); 48 DISALLOW_COPY_AND_ASSIGN(GvrGamepadDataFetcher);
48 }; 49 };
49 50
50 } // namespace device 51 } // namespace device
51 #endif // DEVICE_VR_ANDROID_GVR_GAMEPAD_DATA_FETCHER_H_ 52 #endif // DEVICE_VR_ANDROID_GVR_GAMEPAD_DATA_FETCHER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698