| Index: content/child/mojo/mojo_application.h
|
| diff --git a/content/child/mojo/mojo_application.h b/content/child/mojo/mojo_application.h
|
| index 5303a30bc2e6915cc7a70e6b079d18b4be9dbeac..61cc50032f6dbc2cff5680cb2fccbd80cb7e037f 100644
|
| --- a/content/child/mojo/mojo_application.h
|
| +++ b/content/child/mojo/mojo_application.h
|
| @@ -5,10 +5,13 @@
|
| #ifndef CONTENT_CHILD_MOJO_MOJO_APPLICATION_H_
|
| #define CONTENT_CHILD_MOJO_MOJO_APPLICATION_H_
|
|
|
| +#include <string>
|
| +
|
| #include "base/macros.h"
|
| #include "content/common/mojo/channel_init.h"
|
| #include "content/common/mojo/service_registry_impl.h"
|
| #include "ipc/ipc_platform_file.h"
|
| +#include "mojo/public/cpp/system/message_pipe.h"
|
|
|
| namespace base {
|
| class SequencedTaskRunner;
|
| @@ -30,6 +33,11 @@ class MojoApplication {
|
| scoped_refptr<base::SequencedTaskRunner> io_task_runner);
|
| virtual ~MojoApplication();
|
|
|
| + // TODO(amistry): Remove OnMessageReceived() when all bootstrapping has
|
| + // migrated to these functions.
|
| + void InitWithToken(std::string token);
|
| + void InitWithPipe(mojo::ScopedMessagePipeHandle handle);
|
| +
|
| bool OnMessageReceived(const IPC::Message& msg);
|
|
|
| ServiceRegistry* service_registry() { return &service_registry_; }
|
|
|