Chromium Code Reviews| Index: mojo/shell/app_container.h |
| diff --git a/mojo/shell/app_container.h b/mojo/shell/app_container.h |
| index 5a55ada7128edeb5d87285544d6b34db3f7e7714..e62504bd5709947621a9836b086aac63ef262019 100644 |
| --- a/mojo/shell/app_container.h |
| +++ b/mojo/shell/app_container.h |
| @@ -8,13 +8,14 @@ |
| #include "base/basictypes.h" |
| #include "base/memory/scoped_ptr.h" |
| #include "base/memory/weak_ptr.h" |
| +#include "base/threading/simple_thread.h" |
| #include "mojo/examples/hello_world_service/hello_world_service_impl.h" |
| #include "mojo/public/system/core.h" |
| #include "mojo/shell/loader.h" |
| namespace base { |
| class FilePath; |
| -class Thread; |
| +class PlatformThreadHandle; |
| } |
| namespace mojo { |
| @@ -26,7 +27,9 @@ namespace shell { |
| class Context; |
| // A container class that runs an app on its own thread. |
| -class AppContainer : public Loader::Delegate { |
| +class AppContainer |
| + : public Loader::Delegate, |
| + public base::DelegateSimpleThread::Delegate { |
| public: |
| explicit AppContainer(Context* context); |
| virtual ~AppContainer(); |
| @@ -34,15 +37,21 @@ class AppContainer : public Loader::Delegate { |
| void Load(const GURL& app_url); |
| private: |
| - // From Loader::Delegate |
| + // From Loader::Delegate. |
| virtual void DidCompleteLoad(const GURL& app_url, |
| const base::FilePath& app_path) OVERRIDE; |
| + // From base::DelegateSimpleThread::Delegate. |
| + virtual void Run() OVERRIDE; |
| + |
| void AppCompleted(); |
| Context* context_; |
| + base::FilePath app_path_; |
| + Handle app_handle_raw_; |
| + scoped_refptr<base::MessageLoopProxy> main_message_loop_proxy_; |
|
abarth-chromium
2013/11/14 23:59:05
You don't need a main_message_loop_proxy_ member.
DaveMoore
2013/11/15 00:11:33
Done.
|
| scoped_ptr<Loader::Job> request_; |
| - scoped_ptr<base::Thread> thread_; |
| + scoped_ptr<base::DelegateSimpleThread> thread_; |
| scoped_ptr<examples::HelloWorldServiceImpl> hello_world_service_; |
| scoped_ptr<services::NativeViewportController> native_viewport_controller_; |