| Index: chrome/utility/chrome_content_utility_client.h
|
| diff --git a/chrome/utility/chrome_content_utility_client.h b/chrome/utility/chrome_content_utility_client.h
|
| index 8134fe4f72dd3a87fe022cc3b7a5b8a5580d2dfb..db68775e12d7f191ced61b7dbe4a1c19670af741 100644
|
| --- a/chrome/utility/chrome_content_utility_client.h
|
| +++ b/chrome/utility/chrome_content_utility_client.h
|
| @@ -10,15 +10,22 @@
|
| #include <vector>
|
|
|
| #include "base/compiler_specific.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/scoped_vector.h"
|
| #include "content/public/utility/content_utility_client.h"
|
| #include "ipc/ipc_platform_file.h"
|
| +#include "mojo/common/weak_binding_set.h"
|
| +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
|
|
|
| namespace base {
|
| class FilePath;
|
| struct FileDescriptor;
|
| }
|
|
|
| +namespace content {
|
| +class Process;
|
| +}
|
| +
|
| class UtilityMessageHandler;
|
|
|
| class ChromeContentUtilityClient : public content::ContentUtilityClient {
|
| @@ -81,6 +88,8 @@ class ChromeContentUtilityClient : public content::ContentUtilityClient {
|
| bool get_attached_images);
|
| #endif
|
|
|
| + void BindProcessRequest(mojo::InterfaceRequest<content::Process> request);
|
| +
|
| typedef ScopedVector<UtilityMessageHandler> Handlers;
|
| Handlers handlers_;
|
|
|
| @@ -91,6 +100,11 @@ class ChromeContentUtilityClient : public content::ContentUtilityClient {
|
| // Maximum IPC msg size (default to kMaximumMessageSize; override for testing)
|
| static int64_t max_ipc_message_size_;
|
|
|
| + // Mojo child process implementation.
|
| + scoped_ptr<content::Process> process_impl_;
|
| + // Bindings to the Process impl.
|
| + mojo::WeakBindingSet<content::Process> process_bindings_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(ChromeContentUtilityClient);
|
| };
|
|
|
|
|