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

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

Issue 2471433002: Implement WebVR presentation pausing for VR Shell Menu Mode (Closed)
Patch Set: rebase 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/vr/android/gvr/gvr_delegate.h ('k') | device/vr/android/gvr/gvr_device.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/vr/android/gvr/gvr_device.h
diff --git a/device/vr/android/gvr/gvr_device.h b/device/vr/android/gvr/gvr_device.h
index 339b30df77a0e96995038846b1a13bc207cd2f13..f21dd1c557d5f60310ffa601ef038f3d40eed3c3 100644
--- a/device/vr/android/gvr/gvr_device.h
+++ b/device/vr/android/gvr/gvr_device.h
@@ -6,6 +6,7 @@
#define DEVICE_VR_ANDROID_GVR_DEVICE_H
#include "base/macros.h"
+#include "base/memory/weak_ptr.h"
#include "device/vr/vr_device.h"
namespace gvr {
@@ -19,7 +20,8 @@ class GvrDelegate;
class GvrDevice : public VRDevice {
public:
- GvrDevice(GvrDeviceProvider* provider, GvrDelegate* delegate);
+ GvrDevice(GvrDeviceProvider* provider,
+ const base::WeakPtr<GvrDelegate>& delegate);
~GvrDevice() override;
// VRDevice
@@ -35,14 +37,14 @@ class GvrDevice : public VRDevice {
mojom::VRLayerBoundsPtr leftBounds,
mojom::VRLayerBoundsPtr rightBounds) override;
- void SetDelegate(GvrDelegate* delegate);
+ void SetDelegate(const base::WeakPtr<GvrDelegate>& delegate);
private:
gvr::GvrApi* GetGvrApi();
- GvrDelegate* delegate_;
+ base::WeakPtr<GvrDelegate> delegate_;
GvrDeviceProvider* gvr_provider_;
- bool secure_origin_;
+ bool secure_origin_ = false;
uint32_t pose_index_ = 0;
DISALLOW_COPY_AND_ASSIGN(GvrDevice);
« no previous file with comments | « device/vr/android/gvr/gvr_delegate.h ('k') | device/vr/android/gvr/gvr_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698