| Index: mojo/shell/app_container.h
|
| diff --git a/mojo/shell/app_container.h b/mojo/shell/app_container.h
|
| index ae6e27722af99f8db43b7c8a8d3b7d0c9208e1a1..5a55ada7128edeb5d87285544d6b34db3f7e7714 100644
|
| --- a/mojo/shell/app_container.h
|
| +++ b/mojo/shell/app_container.h
|
| @@ -8,6 +8,7 @@
|
| #include "base/basictypes.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| +#include "mojo/examples/hello_world_service/hello_world_service_impl.h"
|
| #include "mojo/public/system/core.h"
|
| #include "mojo/shell/loader.h"
|
|
|
| @@ -42,11 +43,9 @@ class AppContainer : public Loader::Delegate {
|
| Context* context_;
|
| scoped_ptr<Loader::Job> request_;
|
| scoped_ptr<base::Thread> thread_;
|
| + scoped_ptr<examples::HelloWorldServiceImpl> hello_world_service_;
|
| scoped_ptr<services::NativeViewportController> native_viewport_controller_;
|
|
|
| - // Following members are valid only on app thread.
|
| - Handle shell_handle_;
|
| -
|
| base::WeakPtrFactory<AppContainer> weak_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(AppContainer);
|
|
|