| Index: device/vr/vr_service_impl.h
|
| diff --git a/device/vr/vr_service_impl.h b/device/vr/vr_service_impl.h
|
| index 091c81d6b01e4d9686bd2b67dff379fc256c5ca3..190f23fa260c428aa65401db3eec5ed781fd3785 100644
|
| --- a/device/vr/vr_service_impl.h
|
| +++ b/device/vr/vr_service_impl.h
|
| @@ -19,9 +19,10 @@ namespace device {
|
|
|
| class VRServiceImpl : public mojom::VRService {
|
| public:
|
| + DEVICE_VR_EXPORT VRServiceImpl();
|
| DEVICE_VR_EXPORT ~VRServiceImpl() override;
|
|
|
| - DEVICE_VR_EXPORT static void BindRequest(
|
| + DEVICE_VR_EXPORT static void Create(
|
| mojo::InterfaceRequest<mojom::VRService> request);
|
|
|
| mojom::VRServiceClient* client() { return client_.get(); }
|
| @@ -35,11 +36,6 @@ class VRServiceImpl : public mojom::VRService {
|
| friend class VRDeviceManagerTest;
|
| friend class VRDisplayImpl;
|
|
|
| - DEVICE_VR_EXPORT VRServiceImpl();
|
| -
|
| - // Mojo connection handling.
|
| - DEVICE_VR_EXPORT void Bind(mojo::InterfaceRequest<mojom::VRService> request);
|
| - void RemoveFromDeviceManager();
|
| void RemoveDevice(VRDevice* device);
|
|
|
| // mojom::VRService implementation
|
| @@ -47,15 +43,12 @@ class VRServiceImpl : public mojom::VRService {
|
| const SetClientCallback& callback) override;
|
| void SetListeningForActivate(bool listening) override;
|
|
|
| - using DisplayImplMap = std::map<VRDevice*, std::unique_ptr<VRDisplayImpl>>;
|
| - DisplayImplMap displays_;
|
| + std::map<VRDevice*, std::unique_ptr<VRDisplayImpl>> displays_;
|
|
|
| mojom::VRServiceClientPtr client_;
|
|
|
| bool listening_for_activate_;
|
|
|
| - std::unique_ptr<mojo::Binding<mojom::VRService>> binding_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(VRServiceImpl);
|
| };
|
|
|
|
|