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