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

Unified Diff: content/common/mojo/channel_init.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: content/common/mojo/channel_init.h
diff --git a/content/common/mojo/channel_init.h b/content/common/mojo/channel_init.h
index 2660a7bcbf285a155385f71bbad0e90b4b694dc2..564309b48cf5d57e644aeb326cd1fe72cccdc6b8 100644
--- a/content/common/mojo/channel_init.h
+++ b/content/common/mojo/channel_init.h
@@ -10,9 +10,12 @@
#include "base/memory/weak_ptr.h"
#include "content/common/content_export.h"
#include "ipc/mojo/scoped_ipc_support.h"
-#include "third_party/mojo/src/mojo/edk/embedder/channel_info_forward.h"
#include "third_party/mojo/src/mojo/public/cpp/system/message_pipe.h"
+#if !defined(USE_CHROME_EDK)
+#include "third_party/mojo/src/mojo/edk/embedder/channel_info_forward.h"
+#endif
+
namespace base {
class TaskRunner;
}
@@ -39,6 +42,7 @@ class CONTENT_EXPORT ChannelInit {
void ShutdownOnIOThread();
private:
+#if !defined(USE_CHROME_EDK)
// Invoked on the thread on which this object lives once the channel has been
// established. This is a static method that takes a weak pointer to self,
// since we want to destroy the channel if we were destroyed first.
@@ -49,6 +53,7 @@ class CONTENT_EXPORT ChannelInit {
// If non-null the channel has been established.
mojo::embedder::ChannelInfo* channel_info_;
+#endif
scoped_ptr<IPC::ScopedIPCSupport> ipc_support_;
base::WeakPtrFactory<ChannelInit> weak_factory_;

Powered by Google App Engine
This is Rietveld 408576698