OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef MOJO_SHELL_APP_CONTAINER_H_ | 5 #ifndef MOJO_SHELL_APP_CONTAINER_H_ |
6 #define MOJO_SHELL_APP_CONTAINER_H_ | 6 #define MOJO_SHELL_APP_CONTAINER_H_ |
7 | 7 |
8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" |
11 #include "base/threading/simple_thread.h" | |
11 #include "mojo/examples/hello_world_service/hello_world_service_impl.h" | 12 #include "mojo/examples/hello_world_service/hello_world_service_impl.h" |
12 #include "mojo/public/system/core.h" | 13 #include "mojo/public/system/core.h" |
13 #include "mojo/shell/loader.h" | 14 #include "mojo/shell/loader.h" |
14 | 15 |
15 namespace base { | 16 namespace base { |
16 class FilePath; | 17 class FilePath; |
17 class Thread; | 18 class PlatformThreadHandle; |
18 } | 19 } |
19 | 20 |
20 namespace mojo { | 21 namespace mojo { |
21 namespace services { | 22 namespace services { |
22 class NativeViewportController; | 23 class NativeViewportController; |
23 } | 24 } |
24 namespace shell { | 25 namespace shell { |
25 | 26 |
26 class Context; | 27 class Context; |
27 | 28 |
28 // A container class that runs an app on its own thread. | 29 // A container class that runs an app on its own thread. |
29 class AppContainer : public Loader::Delegate { | 30 class AppContainer |
31 : public Loader::Delegate, | |
32 public base::DelegateSimpleThread::Delegate { | |
30 public: | 33 public: |
31 explicit AppContainer(Context* context); | 34 explicit AppContainer(Context* context); |
32 virtual ~AppContainer(); | 35 virtual ~AppContainer(); |
33 | 36 |
34 void Load(const GURL& app_url); | 37 void Load(const GURL& app_url); |
35 | 38 |
36 private: | 39 private: |
37 // From Loader::Delegate | 40 // From Loader::Delegate. |
38 virtual void DidCompleteLoad(const GURL& app_url, | 41 virtual void DidCompleteLoad(const GURL& app_url, |
39 const base::FilePath& app_path) OVERRIDE; | 42 const base::FilePath& app_path) OVERRIDE; |
40 | 43 |
44 // From base::DelegateSimpleThread::Delegate. | |
45 virtual void Run() OVERRIDE; | |
46 | |
41 void AppCompleted(); | 47 void AppCompleted(); |
42 | 48 |
43 Context* context_; | 49 Context* context_; |
50 base::FilePath app_path_; | |
51 Handle app_handle_raw_; | |
52 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.
| |
44 scoped_ptr<Loader::Job> request_; | 53 scoped_ptr<Loader::Job> request_; |
45 scoped_ptr<base::Thread> thread_; | 54 scoped_ptr<base::DelegateSimpleThread> thread_; |
46 scoped_ptr<examples::HelloWorldServiceImpl> hello_world_service_; | 55 scoped_ptr<examples::HelloWorldServiceImpl> hello_world_service_; |
47 scoped_ptr<services::NativeViewportController> native_viewport_controller_; | 56 scoped_ptr<services::NativeViewportController> native_viewport_controller_; |
48 | 57 |
49 base::WeakPtrFactory<AppContainer> weak_factory_; | 58 base::WeakPtrFactory<AppContainer> weak_factory_; |
50 | 59 |
51 DISALLOW_COPY_AND_ASSIGN(AppContainer); | 60 DISALLOW_COPY_AND_ASSIGN(AppContainer); |
52 }; | 61 }; |
53 | 62 |
54 } // namespace shell | 63 } // namespace shell |
55 } // namespace mojo | 64 } // namespace mojo |
56 | 65 |
57 #endif // MOJO_SHELL_APP_CONTAINER_H_ | 66 #endif // MOJO_SHELL_APP_CONTAINER_H_ |
OLD | NEW |