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

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

Issue 2493063004: Fix exiting WebVR via Android UI not fully exiting fullscreen. (Closed)
Patch Set: 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_DEVICE_PROVIDER_H 5 #ifndef DEVICE_VR_ANDROID_GVR_DEVICE_PROVIDER_H
6 #define DEVICE_VR_ANDROID_GVR_DEVICE_PROVIDER_H 6 #define DEVICE_VR_ANDROID_GVR_DEVICE_PROVIDER_H
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/single_thread_task_runner.h" 11 #include "base/single_thread_task_runner.h"
12 #include "device/vr/vr_device.h" 12 #include "device/vr/vr_device.h"
13 #include "device/vr/vr_device_provider.h" 13 #include "device/vr/vr_device_provider.h"
14 #include "device/vr/vr_export.h" 14 #include "device/vr/vr_export.h"
15 15
16 namespace device { 16 namespace device {
17 17
18 class GvrDelegateProvider;
18 class GvrDelegate; 19 class GvrDelegate;
19 class GvrDevice; 20 class GvrDevice;
20 class VRServiceImpl; 21 class VRServiceImpl;
21 22
22 class DEVICE_VR_EXPORT GvrDeviceProvider : public VRDeviceProvider { 23 class DEVICE_VR_EXPORT GvrDeviceProvider : public VRDeviceProvider {
23 public: 24 public:
24 GvrDeviceProvider(); 25 GvrDeviceProvider();
25 ~GvrDeviceProvider() override; 26 ~GvrDeviceProvider() override;
26 27
27 void GetDevices(std::vector<VRDevice*>* devices) override; 28 void GetDevices(std::vector<VRDevice*>* devices) override;
28 void Initialize() override; 29 void Initialize() override;
29 30
30 // Called from GvrDevice 31 // Called from GvrDevice
31 bool RequestPresent(); 32 bool RequestPresent();
32 void ExitPresent(); 33 void ExitPresent();
33 34
34 // Called from GvrDelegate 35 // Called from GvrDelegate
35 void OnGvrDelegateReady(GvrDelegate* delegate); 36 void OnGvrDelegateReady(GvrDelegate* delegate);
36 void OnGvrDelegateRemoved(); 37 void OnGvrDelegateRemoved();
37 38
38 private: 39 private:
39 void GvrDelegateReady(GvrDelegate* delegate); 40 void GvrDelegateReady(GvrDelegate* delegate);
40 void GvrDelegateRemoved(); 41 void GvrDelegateRemoved();
41 42
43 void SwitchToNonPresentingDelegate();
44
42 std::unique_ptr<GvrDevice> vr_device_; 45 std::unique_ptr<GvrDevice> vr_device_;
43 46
44 scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_; 47 scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
45 48
46 DISALLOW_COPY_AND_ASSIGN(GvrDeviceProvider); 49 DISALLOW_COPY_AND_ASSIGN(GvrDeviceProvider);
47 }; 50 };
48 51
49 } // namespace device 52 } // namespace device
50 53
51 #endif // DEVICE_VR_ANDROID_GVR_DEVICE_PROVIDER_H 54 #endif // DEVICE_VR_ANDROID_GVR_DEVICE_PROVIDER_H
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698