diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/device/vr/android | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/device/vr/android')
| -rw-r--r-- | chromium/device/vr/android/gvr/gvr_device_provider.cc | 2 | ||||
| -rw-r--r-- | chromium/device/vr/android/gvr/gvr_device_provider.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/chromium/device/vr/android/gvr/gvr_device_provider.cc b/chromium/device/vr/android/gvr/gvr_device_provider.cc index 7e967c15b5d..b5fd9868352 100644 --- a/chromium/device/vr/android/gvr/gvr_device_provider.cc +++ b/chromium/device/vr/android/gvr/gvr_device_provider.cc @@ -17,6 +17,7 @@ GvrDeviceProvider::~GvrDeviceProvider() = default; void GvrDeviceProvider::Initialize( base::RepeatingCallback<void(mojom::XRDeviceId, mojom::VRDisplayInfoPtr, + mojom::XRDeviceDataPtr, mojo::PendingRemote<mojom::XRRuntime>)> add_device_callback, base::RepeatingCallback<void(mojom::XRDeviceId)> remove_device_callback, @@ -32,6 +33,7 @@ void GvrDeviceProvider::Initialize( } if (vr_device_) { add_device_callback.Run(vr_device_->GetId(), vr_device_->GetVRDisplayInfo(), + vr_device_->GetDeviceData(), vr_device_->BindXRRuntime()); } initialized_ = true; diff --git a/chromium/device/vr/android/gvr/gvr_device_provider.h b/chromium/device/vr/android/gvr/gvr_device_provider.h index dcf579f60d8..aed9b3abe96 100644 --- a/chromium/device/vr/android/gvr/gvr_device_provider.h +++ b/chromium/device/vr/android/gvr/gvr_device_provider.h @@ -24,6 +24,7 @@ class DEVICE_VR_EXPORT GvrDeviceProvider : public VRDeviceProvider { void Initialize( base::RepeatingCallback<void(mojom::XRDeviceId, mojom::VRDisplayInfoPtr, + mojom::XRDeviceDataPtr, mojo::PendingRemote<mojom::XRRuntime>)> add_device_callback, base::RepeatingCallback<void(mojom::XRDeviceId)> remove_device_callback, |