Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(584)

Side by Side Diff: mojo/runner/context.h

Issue 1554443003: Stop linking in the old Mojo EDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge and fix new flaky test Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « mojo/runner/child/test_native_main.cc ('k') | mojo/runner/context.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
14 #include "mojo/runner/scoped_user_data_dir.h" 15 #include "mojo/runner/scoped_user_data_dir.h"
15 #include "mojo/runner/task_runners.h" 16 #include "mojo/runner/task_runners.h"
16 #include "mojo/runner/tracer.h" 17 #include "mojo/runner/tracer.h"
17 #include "mojo/shell/application_manager.h" 18 #include "mojo/shell/application_manager.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 PackageManagerImpl; 23 class PackageManagerImpl;
24 } 24 }
25 namespace runner { 25 namespace runner {
26 26
27 class NativeApplicationLoader; 27 class NativeApplicationLoader;
28 28
29 // The "global" context for the shell's main process. 29 // The "global" context for the shell's main process.
30 // TODO(use_chrome_edk) 30 class Context : public edk::ProcessDelegate {
31 //class Context : public edk::ProcessDelegate {
32 class Context : public embedder::ProcessDelegate {
33 public: 31 public:
34 Context(); 32 Context();
35 ~Context() override; 33 ~Context() override;
36 34
37 static void EnsureEmbedderIsInitialized(); 35 static void EnsureEmbedderIsInitialized();
38 36
39 // This must be called with a message loop set up for the current thread, 37 // This must be called with a message loop set up for the current thread,
40 // which must remain alive until after Shutdown() is called. Returns true on 38 // which must remain alive until after Shutdown() is called. Returns true on
41 // success. 39 // success.
42 bool Init(const base::FilePath& shell_file_root); 40 bool Init(const base::FilePath& shell_file_root);
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 base::Closure app_complete_callback_; 78 base::Closure app_complete_callback_;
81 base::Time main_entry_time_; 79 base::Time main_entry_time_;
82 80
83 DISALLOW_COPY_AND_ASSIGN(Context); 81 DISALLOW_COPY_AND_ASSIGN(Context);
84 }; 82 };
85 83
86 } // namespace runner 84 } // namespace runner
87 } // namespace mojo 85 } // namespace mojo
88 86
89 #endif // MOJO_RUNNER_CONTEXT_H_ 87 #endif // MOJO_RUNNER_CONTEXT_H_
OLDNEW
« no previous file with comments | « mojo/runner/child/test_native_main.cc ('k') | mojo/runner/context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698