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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/runner/context.h
diff --git a/mojo/runner/context.h b/mojo/runner/context.h
index 2db71887c34f34ae4fd1bd6c7f5b5a65b14075f7..7856fdf80a2fb736bef6ad27f92632246f382f11 100644
--- a/mojo/runner/context.h
+++ b/mojo/runner/context.h
@@ -11,11 +11,11 @@
#include "base/callback_forward.h"
#include "base/macros.h"
#include "base/time/time.h"
+#include "mojo/edk/embedder/process_delegate.h"
#include "mojo/runner/scoped_user_data_dir.h"
#include "mojo/runner/task_runners.h"
#include "mojo/runner/tracer.h"
#include "mojo/shell/application_manager.h"
-#include "third_party/mojo/src/mojo/edk/embedder/process_delegate.h"
#include "url/gurl.h"
namespace mojo {
@@ -27,9 +27,7 @@ namespace runner {
class NativeApplicationLoader;
// The "global" context for the shell's main process.
-// TODO(use_chrome_edk)
-//class Context : public edk::ProcessDelegate {
-class Context : public embedder::ProcessDelegate {
+class Context : public edk::ProcessDelegate {
public:
Context();
~Context() override;
« 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