| Index: services/video_capture/service_impl.h
|
| diff --git a/services/video_capture/service_impl.h b/services/video_capture/service_impl.h
|
| index a4aef2add3d5e41955f0b39bb1245d961bd3aa0a..dfa6d6738ace0b11572e4366d994c2220bbe27f3 100644
|
| --- a/services/video_capture/service_impl.h
|
| +++ b/services/video_capture/service_impl.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef SERVICES_VIDEO_CAPTURE_VIDEO_CAPTURE_SERVICE_H_
|
| -#define SERVICES_VIDEO_CAPTURE_VIDEO_CAPTURE_SERVICE_H_
|
| +#ifndef SERVICES_VIDEO_CAPTURE_SERVICE_IMPL_H_
|
| +#define SERVICES_VIDEO_CAPTURE_SERVICE_IMPL_H_
|
|
|
| #include <memory>
|
|
|
| @@ -11,45 +11,39 @@
|
| #include "services/service_manager/public/cpp/binder_registry.h"
|
| #include "services/service_manager/public/cpp/interface_factory.h"
|
| #include "services/service_manager/public/cpp/service.h"
|
| -#include "services/video_capture/public/interfaces/service.mojom.h"
|
| +#include "services/service_manager/public/cpp/service_context_ref.h"
|
| +#include "services/video_capture/public/interfaces/device_factory_provider.mojom.h"
|
|
|
| namespace video_capture {
|
|
|
| -class DeviceFactoryMediaToMojoAdapter;
|
| -
|
| -// Implementation of video_capture::mojom::Service as a Service Manager service.
|
| -class ServiceImpl : public service_manager::Service,
|
| - public service_manager::InterfaceFactory<mojom::Service>,
|
| - public mojom::Service {
|
| +class ServiceImpl : public service_manager::Service {
|
| public:
|
| ServiceImpl();
|
| ~ServiceImpl() override;
|
|
|
| - // service_manager::Service:
|
| + // service_manager::Service implementation.
|
| + void OnStart() override;
|
| void OnBindInterface(const service_manager::ServiceInfo& source_info,
|
| const std::string& interface_name,
|
| mojo::ScopedMessagePipeHandle interface_pipe) override;
|
| -
|
| - // service_manager::InterfaceFactory<video_capture::mojom::Service>:
|
| - void Create(const service_manager::Identity& remote_identity,
|
| - mojom::ServiceRequest request) override;
|
| -
|
| - // video_capture::mojom::Service
|
| - void ConnectToDeviceFactory(mojom::DeviceFactoryRequest request) override;
|
| - void ConnectToFakeDeviceFactory(mojom::DeviceFactoryRequest request) override;
|
| + bool OnServiceManagerConnectionLost() override;
|
|
|
| private:
|
| - void LazyInitializeDeviceFactory();
|
| - void LazyInitializeFakeDeviceFactory();
|
| + void OnDeviceFactoryProviderRequest(
|
| + mojom::DeviceFactoryProviderRequest request);
|
| + void SetShutdownDelayInSeconds(float seconds);
|
| + void MaybeRequestQuitDelayed();
|
| + void MaybeRequestQuit();
|
|
|
| + float shutdown_delay_in_seconds_;
|
| service_manager::BinderRegistry registry_;
|
| - mojo::BindingSet<mojom::Service> service_bindings_;
|
| - mojo::BindingSet<mojom::DeviceFactory> factory_bindings_;
|
| - mojo::BindingSet<mojom::DeviceFactory> fake_factory_bindings_;
|
| - std::unique_ptr<DeviceFactoryMediaToMojoAdapter> device_factory_;
|
| - std::unique_ptr<DeviceFactoryMediaToMojoAdapter> fake_device_factory_;
|
| + std::unique_ptr<service_manager::ServiceContextRefFactory> ref_factory_;
|
| + base::ThreadChecker thread_checker_;
|
| + base::WeakPtrFactory<ServiceImpl> weak_factory_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(ServiceImpl);
|
| };
|
|
|
| } // namespace video_capture
|
|
|
| -#endif // SERVICES_VIDEO_CAPTURE_VIDEO_CAPTURE_SERVICE_H_
|
| +#endif // SERVICES_VIDEO_CAPTURE_SERVICE_IMPL_H_
|
|
|