| Index: content/browser/mojo/mojo_application_host.h
|
| diff --git a/content/browser/mojo/mojo_application_host.h b/content/browser/mojo/mojo_application_host.h
|
| index 0ed8ec917badba1d855bb304250dea5478ff10f1..82dcb6423b0fc960e0986646dbf1836a2c3f5790 100644
|
| --- a/content/browser/mojo/mojo_application_host.h
|
| +++ b/content/browser/mojo/mojo_application_host.h
|
| @@ -7,11 +7,13 @@
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "base/memory/weak_ptr.h"
|
| #include "base/process/process_handle.h"
|
| #include "build/build_config.h"
|
| #include "content/common/application_setup.mojom.h"
|
| #include "content/common/mojo/channel_init.h"
|
| #include "content/common/mojo/service_registry_impl.h"
|
| +#include "mojo/public/cpp/system/message_pipe.h"
|
| #include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h"
|
|
|
| #if defined(OS_ANDROID)
|
| @@ -54,6 +56,8 @@ class CONTENT_EXPORT MojoApplicationHost {
|
| scoped_refptr<base::TaskRunner> io_task_runner);
|
|
|
| private:
|
| + void OnMessagePipeCreated(mojo::ScopedMessagePipeHandle pipe);
|
| +
|
| ChannelInit channel_init_;
|
| mojo::embedder::ScopedPlatformHandle client_handle_;
|
|
|
| @@ -68,6 +72,8 @@ class CONTENT_EXPORT MojoApplicationHost {
|
| scoped_ptr<ServiceRegistryAndroid> service_registry_android_;
|
| #endif
|
|
|
| + base::WeakPtrFactory<MojoApplicationHost> weak_factory_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(MojoApplicationHost);
|
| };
|
|
|
|
|