| 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_STANDALONE_CONTEXT_H_ | 5 #ifndef MOJO_SHELL_STANDALONE_CONTEXT_H_ |
| 6 #define MOJO_SHELL_STANDALONE_CONTEXT_H_ | 6 #define MOJO_SHELL_STANDALONE_CONTEXT_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| 11 #include "base/callback_forward.h" | 11 #include "base/callback_forward.h" |
| 12 #include "base/macros.h" | 12 #include "base/macros.h" |
| 13 #include "base/time/time.h" | 13 #include "base/time/time.h" |
| 14 #include "mojo/edk/embedder/process_delegate.h" |
| 14 #include "mojo/shell/application_manager.h" | 15 #include "mojo/shell/application_manager.h" |
| 15 #include "mojo/shell/standalone/scoped_user_data_dir.h" | 16 #include "mojo/shell/standalone/scoped_user_data_dir.h" |
| 16 #include "mojo/shell/standalone/task_runners.h" | 17 #include "mojo/shell/standalone/task_runners.h" |
| 17 #include "mojo/shell/standalone/tracer.h" | 18 #include "mojo/shell/standalone/tracer.h" |
| 18 #include "third_party/mojo/src/mojo/edk/embedder/process_delegate.h" | |
| 19 #include "url/gurl.h" | 19 #include "url/gurl.h" |
| 20 | 20 |
| 21 namespace mojo { | 21 namespace mojo { |
| 22 namespace shell { | 22 namespace shell { |
| 23 class NativeApplicationLoader; | 23 class NativeApplicationLoader; |
| 24 class PackageManagerImpl; | 24 class PackageManagerImpl; |
| 25 | 25 |
| 26 // The "global" context for the shell's main process. | 26 // The "global" context for the shell's main process. |
| 27 // TODO(use_chrome_edk) | 27 class Context : public edk::ProcessDelegate { |
| 28 // class Context : public edk::ProcessDelegate { | |
| 29 class Context : public embedder::ProcessDelegate { | |
| 30 public: | 28 public: |
| 31 Context(); | 29 Context(); |
| 32 ~Context() override; | 30 ~Context() override; |
| 33 | 31 |
| 34 static void EnsureEmbedderIsInitialized(); | 32 static void EnsureEmbedderIsInitialized(); |
| 35 | 33 |
| 36 // This must be called with a message loop set up for the current thread, | 34 // This must be called with a message loop set up for the current thread, |
| 37 // which must remain alive until after Shutdown() is called. | 35 // which must remain alive until after Shutdown() is called. |
| 38 void Init(const base::FilePath& shell_file_root); | 36 void Init(const base::FilePath& shell_file_root); |
| 39 | 37 |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 base::Closure app_complete_callback_; | 74 base::Closure app_complete_callback_; |
| 77 base::Time main_entry_time_; | 75 base::Time main_entry_time_; |
| 78 | 76 |
| 79 DISALLOW_COPY_AND_ASSIGN(Context); | 77 DISALLOW_COPY_AND_ASSIGN(Context); |
| 80 }; | 78 }; |
| 81 | 79 |
| 82 } // namespace shell | 80 } // namespace shell |
| 83 } // namespace mojo | 81 } // namespace mojo |
| 84 | 82 |
| 85 #endif // MOJO_SHELL_STANDALONE_CONTEXT_H_ | 83 #endif // MOJO_SHELL_STANDALONE_CONTEXT_H_ |
| OLD | NEW |