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

Unified Diff: mojo/runner/context.h

Issue 1350023003: Add a Mojo EDK for Chrome that uses one OS pipe per message pipe. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move to mojo::edk namespace in preparation for runtim flag Created 5 years, 3 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
Index: mojo/runner/context.h
diff --git a/mojo/runner/context.h b/mojo/runner/context.h
index 5667385f3b3ad544e135b488de50ccd1838dff4f..845e39c8eaaa579d9aaef255ec3bc4992224fe1f 100644
--- a/mojo/runner/context.h
+++ b/mojo/runner/context.h
@@ -11,12 +11,17 @@
#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/shell/application_manager.h"
#include "url/gurl.h"
+#if defined(USE_CHROME_EDK)
+#include "mojo/edk/embedder/process_delegate.h"
+#else
+#include "third_party/mojo/src/mojo/edk/embedder/process_delegate.h"
+#endif
+
namespace mojo {
namespace package_manager {
class PackageManagerImpl;
@@ -26,7 +31,11 @@ namespace runner {
class NativeApplicationLoader;
// The "global" context for the shell's main process.
+#if defined(USE_CHROME_EDK)
+class Context : public edk::ProcessDelegate {
+#else
class Context : public embedder::ProcessDelegate {
+#endif
public:
explicit Context(const base::FilePath& shell_file_root);
~Context() override;

Powered by Google App Engine
This is Rietveld 408576698