| Index: content/browser/vr/vr_device_manager.h
|
| diff --git a/content/browser/vr/vr_device_manager.h b/content/browser/vr/vr_device_manager.h
|
| index 9431eddf9f12cb0fd5a450beeaa14388579e7706..72930f20e6f6a492475405284e11c63bf4d0e137 100644
|
| --- a/content/browser/vr/vr_device_manager.h
|
| +++ b/content/browser/vr/vr_device_manager.h
|
| @@ -17,21 +17,22 @@
|
| #include "content/browser/vr/vr_device.h"
|
| #include "content/browser/vr/vr_device_provider.h"
|
| #include "content/common/content_export.h"
|
| -#include "content/common/vr_service.mojom.h"
|
| #include "mojo/public/cpp/bindings/binding_set.h"
|
| +#include "third_party/WebKit/public/platform/modules/vr/vr_service.mojom.h"
|
|
|
| namespace content {
|
|
|
| -class VRDeviceManager : public mojom::VRService {
|
| +class VRDeviceManager : public blink::mojom::VRService {
|
| public:
|
| ~VRDeviceManager() override;
|
|
|
| - static void BindRequest(mojo::InterfaceRequest<mojom::VRService> request);
|
| + static void BindRequest(
|
| + mojo::InterfaceRequest<blink::mojom::VRService> request);
|
|
|
| // Returns the VRDeviceManager singleton.
|
| static VRDeviceManager* GetInstance();
|
|
|
| - mojo::Array<mojom::VRDeviceInfoPtr> GetVRDevices();
|
| + mojo::Array<blink::mojom::VRDeviceInfoPtr> GetVRDevices();
|
| VRDevice* GetDevice(unsigned int index);
|
|
|
| private:
|
| @@ -47,7 +48,7 @@ class VRDeviceManager : public mojom::VRService {
|
| void InitializeProviders();
|
| void RegisterProvider(std::unique_ptr<VRDeviceProvider> provider);
|
|
|
| - // mojom::VRService implementation
|
| + // VRService implementation
|
| void GetDevices(const GetDevicesCallback& callback) override;
|
| void GetSensorState(uint32_t index,
|
| const GetSensorStateCallback& callback) override;
|
| @@ -65,7 +66,7 @@ class VRDeviceManager : public mojom::VRService {
|
|
|
| bool vr_initialized_;
|
|
|
| - mojo::BindingSet<mojom::VRService> bindings_;
|
| + mojo::BindingSet<blink::mojom::VRService> bindings_;
|
|
|
| // For testing. If true will not delete self when consumer count reaches 0.
|
| bool keep_alive_;
|
|
|