| Index: content/browser/browser_child_process_host_impl.h
|
| diff --git a/content/browser/browser_child_process_host_impl.h b/content/browser/browser_child_process_host_impl.h
|
| index 08e1b360a1147dec8c9124e9800333585eb3f978..6c642c06f60ac8e62b63f95fff9dd9e0d1f6e074 100644
|
| --- a/content/browser/browser_child_process_host_impl.h
|
| +++ b/content/browser/browser_child_process_host_impl.h
|
| @@ -9,6 +9,7 @@
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "base/memory/weak_ptr.h"
|
| #include "base/process/process.h"
|
| #include "base/synchronization/waitable_event_watcher.h"
|
| #include "content/browser/child_process_launcher.h"
|
| @@ -30,6 +31,7 @@ namespace content {
|
| class BrowserChildProcessHostIterator;
|
| class BrowserChildProcessObserver;
|
| class BrowserMessageFilter;
|
| +class ServiceRegistry;
|
|
|
| // Plugins/workers and other child processes that live on the IO thread use this
|
| // class. RenderProcessHostImpl is the main exception that doesn't use this
|
| @@ -61,6 +63,7 @@ class CONTENT_EXPORT BrowserChildProcessHostImpl
|
| int* exit_code) override;
|
| void SetName(const base::string16& name) override;
|
| void SetHandle(base::ProcessHandle handle) override;
|
| + ServiceRegistry* GetServiceRegistry() override;
|
|
|
| // ChildProcessHostDelegate implementation:
|
| bool CanShutdown() override;
|
| @@ -80,6 +83,9 @@ class CONTENT_EXPORT BrowserChildProcessHostImpl
|
| // Adds an IPC message filter.
|
| void AddFilter(BrowserMessageFilter* filter);
|
|
|
| + // Set the Mojo service registry connected to the child process.
|
| + void SetServiceRegistry(base::WeakPtr<ServiceRegistry> service_registry);
|
| +
|
| // Called when an instance of a particular child is created in a page.
|
| static void NotifyProcessInstanceCreated(const ChildProcessData& data);
|
|
|
| @@ -114,6 +120,8 @@ class CONTENT_EXPORT BrowserChildProcessHostImpl
|
|
|
| PowerMonitorMessageBroadcaster power_monitor_message_broadcaster_;
|
|
|
| + base::WeakPtr<ServiceRegistry> service_registry_;
|
| +
|
| #if defined(OS_WIN)
|
| // Watches to see if the child process exits before the IPC channel has
|
| // been connected. Thereafter, its exit is determined by an error on the
|
|
|