| Index: content/common/service_manager/service_manager_connection_impl.h
|
| diff --git a/content/common/service_manager/service_manager_connection_impl.h b/content/common/service_manager/service_manager_connection_impl.h
|
| index 4017d05cb9c66fc6a027f85957b8b4dd48434500..c950283b81b77c23ef07c000643e64b63f6ec910 100644
|
| --- a/content/common/service_manager/service_manager_connection_impl.h
|
| +++ b/content/common/service_manager/service_manager_connection_impl.h
|
| @@ -37,7 +37,8 @@ class CONTENT_EXPORT ServiceManagerConnectionImpl
|
| // ServiceManagerConnection:
|
| void Start() override;
|
| service_manager::Connector* GetConnector() override;
|
| - const service_manager::Identity& GetIdentity() const override;
|
| + const service_manager::ServiceInfo& GetLocalInfo() const override;
|
| + const service_manager::ServiceInfo& GetBrowserInfo() const override;
|
| void SetConnectionLostClosure(const base::Closure& closure) override;
|
| void SetupInterfaceRequestProxies(
|
| service_manager::InterfaceRegistry* registry,
|
| @@ -52,17 +53,17 @@ class CONTENT_EXPORT ServiceManagerConnectionImpl
|
| int AddOnConnectHandler(const OnConnectHandler& handler) override;
|
| void RemoveOnConnectHandler(int id) override;
|
|
|
| - void OnContextInitialized(const service_manager::Identity& identity);
|
| + void OnLocalServiceInfoAvailable(
|
| + const service_manager::ServiceInfo& local_info);
|
| + void OnBrowserServiceInfoAvailable(
|
| + const service_manager::ServiceInfo& browser_info);
|
| void OnConnectionLost();
|
| - void OnConnect(const service_manager::ServiceInfo& local_info,
|
| - const service_manager::ServiceInfo& remote_info);
|
| void GetInterface(service_manager::mojom::InterfaceProvider* provider,
|
| const std::string& interface_name,
|
| mojo::ScopedMessagePipeHandle request_handle);
|
|
|
| - service_manager::Identity identity_;
|
| service_manager::ServiceInfo local_info_;
|
| - service_manager::ServiceInfo last_remote_info_;
|
| + service_manager::ServiceInfo browser_info_;
|
|
|
| std::unique_ptr<service_manager::Connector> connector_;
|
| scoped_refptr<IOThreadContext> context_;
|
|
|