Chromium Code Reviews| 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..046bd917637d08b48c18b67a9c7a13d7ff67924d 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,7 @@ class GvrDelegate; |
| class GvrDevice : public VRDevice { |
| public: |
| - GvrDevice(GvrDeviceProvider* provider, GvrDelegate* delegate); |
| + GvrDevice(GvrDeviceProvider* provider, base::WeakPtr<GvrDelegate> delegate); |
|
dcheng
2016/11/12 02:03:31
Nit: const ref.
mthiesse
2016/11/14 16:41:38
Done.
|
| ~GvrDevice() override; |
| // VRDevice |
| @@ -35,14 +36,14 @@ class GvrDevice : public VRDevice { |
| mojom::VRLayerBoundsPtr leftBounds, |
| mojom::VRLayerBoundsPtr rightBounds) override; |
| - void SetDelegate(GvrDelegate* delegate); |
| + void SetDelegate(base::WeakPtr<GvrDelegate> delegate); |
|
dcheng
2016/11/12 02:03:31
Ditto.
mthiesse
2016/11/14 16:41:38
Done.
|
| 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); |