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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/mojo/mojo_application_host.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: 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
« base/win/object_watcher.h ('K') | « content/browser/browser_child_process_host_impl.cc ('k') | content/browser/mojo/mojo_application_host.cc » ('j') | mojo/edk/system/message_pipe_dispatcher.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/mojo/mojo_application_host.h
diff --git a/content/browser/mojo/mojo_application_host.h b/content/browser/mojo/mojo_application_host.h
index fffb59e05c63395ee3e666f4eb4faa249cf7d49c..4e10fcdd2239b37aa1e1c743ea6e169dc32d0a60 100644
--- a/content/browser/mojo/mojo_application_host.h
+++ b/content/browser/mojo/mojo_application_host.h
@@ -10,7 +10,12 @@
#include "content/common/application_setup.mojom.h"
#include "content/common/mojo/channel_init.h"
#include "content/common/mojo/service_registry_impl.h"
+
+#if defined(USE_CHROME_EDK)
+#include "mojo/edk/embedder/scoped_platform_handle.h"
+#else
#include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h"
+#endif
#if defined(OS_ANDROID)
#include "content/browser/mojo/service_registry_android.h"
« base/win/object_watcher.h ('K') | « content/browser/browser_child_process_host_impl.cc ('k') | content/browser/mojo/mojo_application_host.cc » ('j') | mojo/edk/system/message_pipe_dispatcher.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698