Chromium Code Reviews| 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 6ef9f895680f59c98b034ebcf475d5799b019313..00f50408719766b39505cb68d0a7c74ee4393c22 100644 |
| --- a/content/browser/mojo/mojo_shell_context.h |
| +++ b/content/browser/mojo/mojo_shell_context.h |
| @@ -13,6 +13,7 @@ |
| #include "base/lazy_instance.h" |
| #include "base/macros.h" |
| #include "content/common/content_export.h" |
| +#include "content/public/browser/shell_context.h" |
| #include "services/shell/public/interfaces/connector.mojom.h" |
| #include "services/shell/shell.h" |
| @@ -28,10 +29,10 @@ namespace content { |
| // MojoShellContext hosts the browser's ApplicationManager, coordinating |
| // app registration and interconnection. |
| -class CONTENT_EXPORT MojoShellContext { |
| +class CONTENT_EXPORT MojoShellContext : public ShellContext { |
|
Ken Rockot(use gerrit already)
2016/06/30 14:50:53
nit: I suppose ShellContextImpl is a much better n
|
| public: |
| MojoShellContext(); |
| - ~MojoShellContext(); |
| + ~MojoShellContext() override; |
| // Connects an application at |name| and gets a handle to its exposed |
| // services. This is only intended for use in browser code that's not part of |
| @@ -45,9 +46,6 @@ class CONTENT_EXPORT MojoShellContext { |
| shell::mojom::InterfaceProviderPtr exposed_services, |
| const shell::mojom::Connector::ConnectCallback& callback); |
| - // Returns a shell::Connector that can be used on the IO thread. |
| - static shell::Connector* GetConnectorForIOThread(); |
| - |
| private: |
| class BuiltinManifestProvider; |
| class Proxy; |