Index: services/video_capture/device_factory_provider_impl.h |
diff --git a/services/video_capture/service_impl.h b/services/video_capture/device_factory_provider_impl.h |
similarity index 43% |
copy from services/video_capture/service_impl.h |
copy to services/video_capture/device_factory_provider_impl.h |
index a4aef2add3d5e41955f0b39bb1245d961bd3aa0a..b5d0f3b94d695bbcb91bf68b49e1f41bf4a14964 100644 |
--- a/services/video_capture/service_impl.h |
+++ b/services/video_capture/device_factory_provider_impl.h |
@@ -1,55 +1,49 @@ |
-// Copyright 2016 The Chromium Authors. All rights reserved. |
+// Copyright 2017 The Chromium Authors. All rights reserved. |
// 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_DEVICE_FACTORY_PROVIDER_H_ |
+#define SERVICES_VIDEO_CAPTURE_DEVICE_FACTORY_PROVIDER_H_ |
#include <memory> |
#include "mojo/public/cpp/bindings/binding_set.h" |
-#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 DeviceFactoryProviderImpl : public mojom::DeviceFactoryProvider { |
public: |
- ServiceImpl(); |
- ~ServiceImpl() override; |
+ DeviceFactoryProviderImpl( |
+ std::unique_ptr<service_manager::ServiceContextRef> service_ref, |
+ base::Callback<void(float)> set_shutdown_delay_cb); |
+ ~DeviceFactoryProviderImpl() override; |
- // service_manager::Service: |
- 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 |
+ // mojom::DeviceFactoryProvider implementation. |
void ConnectToDeviceFactory(mojom::DeviceFactoryRequest request) override; |
void ConnectToFakeDeviceFactory(mojom::DeviceFactoryRequest request) override; |
+ void SetShutdownDelayInSeconds(float seconds) override; |
private: |
void LazyInitializeDeviceFactory(); |
void LazyInitializeFakeDeviceFactory(); |
- 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_; |
+ |
+ const std::unique_ptr<service_manager::ServiceContextRef> service_ref_; |
+ base::Callback<void(float)> set_shutdown_delay_cb_; |
+ |
+ DISALLOW_COPY_AND_ASSIGN(DeviceFactoryProviderImpl); |
}; |
} // namespace video_capture |
-#endif // SERVICES_VIDEO_CAPTURE_VIDEO_CAPTURE_SERVICE_H_ |
+#endif // SERVICES_VIDEO_CAPTURE_DEVICE_FACTORY_PROVIDER_H_ |