| 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 "mojo/examples/hello_world_service/hello_world_service_impl.h" |
| 11 #include "mojo/public/system/core.h" | 12 #include "mojo/public/system/core.h" |
| 12 #include "mojo/shell/loader.h" | 13 #include "mojo/shell/loader.h" |
| 13 | 14 |
| 14 namespace base { | 15 namespace base { |
| 15 class FilePath; | 16 class FilePath; |
| 16 class Thread; | 17 class Thread; |
| 17 } | 18 } |
| 18 | 19 |
| 19 namespace mojo { | 20 namespace mojo { |
| 20 namespace services { | 21 namespace services { |
| (...skipping 14 matching lines...) Expand all Loading... |
| 35 private: | 36 private: |
| 36 // From Loader::Delegate | 37 // From Loader::Delegate |
| 37 virtual void DidCompleteLoad(const GURL& app_url, | 38 virtual void DidCompleteLoad(const GURL& app_url, |
| 38 const base::FilePath& app_path) OVERRIDE; | 39 const base::FilePath& app_path) OVERRIDE; |
| 39 | 40 |
| 40 void AppCompleted(); | 41 void AppCompleted(); |
| 41 | 42 |
| 42 Context* context_; | 43 Context* context_; |
| 43 scoped_ptr<Loader::Job> request_; | 44 scoped_ptr<Loader::Job> request_; |
| 44 scoped_ptr<base::Thread> thread_; | 45 scoped_ptr<base::Thread> thread_; |
| 46 scoped_ptr<examples::HelloWorldServiceImpl> hello_world_service_; |
| 45 scoped_ptr<services::NativeViewportController> native_viewport_controller_; | 47 scoped_ptr<services::NativeViewportController> native_viewport_controller_; |
| 46 | 48 |
| 47 // Following members are valid only on app thread. | |
| 48 Handle shell_handle_; | |
| 49 | |
| 50 base::WeakPtrFactory<AppContainer> weak_factory_; | 49 base::WeakPtrFactory<AppContainer> weak_factory_; |
| 51 | 50 |
| 52 DISALLOW_COPY_AND_ASSIGN(AppContainer); | 51 DISALLOW_COPY_AND_ASSIGN(AppContainer); |
| 53 }; | 52 }; |
| 54 | 53 |
| 55 } // namespace shell | 54 } // namespace shell |
| 56 } // namespace mojo | 55 } // namespace mojo |
| 57 | 56 |
| 58 #endif // MOJO_SHELL_APP_CONTAINER_H_ | 57 #endif // MOJO_SHELL_APP_CONTAINER_H_ |
| OLD | NEW |