| Index: content/browser/mojo/mojo_shell_context.h
|
| diff --git a/content/browser/mojo/mojo_shell_context.h b/content/browser/mojo/mojo_shell_context.h
|
| index 2ed9cfcd3ac627010e3d5d6e6c228a0ce4e30fc4..f10d0d2eabcd5a6662f1ae270e2aa5dc6ef30d77 100644
|
| --- a/content/browser/mojo/mojo_shell_context.h
|
| +++ b/content/browser/mojo/mojo_shell_context.h
|
| @@ -21,6 +21,7 @@ class ShellClient;
|
| }
|
|
|
| namespace content {
|
| +class BrowserContext;
|
|
|
| // MojoShellContext hosts the browser's ApplicationManager, coordinating
|
| // app registration and interconnection.
|
| @@ -43,6 +44,17 @@ class CONTENT_EXPORT MojoShellContext {
|
| mojo::shell::mojom::InterfaceProviderPtr exposed_services,
|
| const mojo::shell::mojom::Connector::ConnectCallback& callback);
|
|
|
| + // Like ConnectToApplication(), but connects to the application as a specific
|
| + // userid. (In chrome, BrowserContexts are bound to mojo userids so that
|
| + // different Profiles can have their own instances of Applications.)
|
| + static void ConnectToApplicationWithContext(
|
| + BrowserContext* context,
|
| + const std::string& name,
|
| + const std::string& requestor_name,
|
| + mojo::shell::mojom::InterfaceProviderRequest request,
|
| + mojo::shell::mojom::InterfaceProviderPtr exposed_services,
|
| + const mojo::shell::mojom::Connector::ConnectCallback& callback);
|
| +
|
| static void SetApplicationsForTest(const StaticApplicationMap* apps);
|
|
|
| private:
|
| @@ -50,6 +62,7 @@ class CONTENT_EXPORT MojoShellContext {
|
| friend class Proxy;
|
|
|
| void ConnectToApplicationOnOwnThread(
|
| + uint32_t user_id,
|
| const std::string& name,
|
| const std::string& requestor_name,
|
| mojo::shell::mojom::InterfaceProviderRequest request,
|
|
|