| 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..90bda83290332ba98079149e48da163f8a5cd663 100644
|
| --- a/content/browser/mojo/mojo_shell_context.h
|
| +++ b/content/browser/mojo/mojo_shell_context.h
|
| @@ -13,8 +13,8 @@
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "content/common/content_export.h"
|
| -#include "mojo/shell/application_manager.h"
|
| -#include "mojo/shell/public/interfaces/shell.mojom.h"
|
| +#include "mojo/shell/public/interfaces/connector.mojom.h"
|
| +#include "mojo/shell/shell.h"
|
|
|
| namespace mojo {
|
| class ShellClient;
|
| @@ -58,7 +58,7 @@ class CONTENT_EXPORT MojoShellContext {
|
|
|
| static base::LazyInstance<scoped_ptr<Proxy>> proxy_;
|
|
|
| - scoped_ptr<mojo::shell::ApplicationManager> application_manager_;
|
| + scoped_ptr<mojo::shell::Shell> shell_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(MojoShellContext);
|
| };
|
|
|