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

Unified Diff: mojo/edk/embedder/embedder_internal.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/edk/embedder/embedder_internal.h
diff --git a/third_party/mojo/src/mojo/edk/embedder/embedder_internal.h b/mojo/edk/embedder/embedder_internal.h
similarity index 51%
copy from third_party/mojo/src/mojo/edk/embedder/embedder_internal.h
copy to mojo/edk/embedder/embedder_internal.h
index 6f201b81e65d6430955fa3b02657cd4e58ad3cbe..6fd3dfcdbad8ac506b81564edeb37cc168364faf 100644
--- a/third_party/mojo/src/mojo/edk/embedder/embedder_internal.h
+++ b/mojo/edk/embedder/embedder_internal.h
@@ -11,54 +11,35 @@
#include <stdint.h>
-#include "mojo/edk/system/channel_id.h"
-
namespace base {
class TaskRunner;
}
namespace mojo {
-namespace system {
+namespace edk {
-class ChannelManager;
class Core;
-class IPCSupport;
-
-} // namespace system
-
-namespace embedder {
-
class PlatformSupport;
class ProcessDelegate;
-// This is a type that's opaque to users of the embedder API (which only
-// gives/takes |ChannelInfo*|s). We make it a struct to make it
-// template-friendly.
-struct ChannelInfo {
- explicit ChannelInfo(system::ChannelId channel_id = 0)
- : channel_id(channel_id) {}
-
- system::ChannelId channel_id;
-};
-
namespace internal {
// Instance of |PlatformSupport| to use.
extern PlatformSupport* g_platform_support;
// Instance of |Core| used by the system functions (|Mojo...()|).
-extern system::Core* g_core;
-
-// Instance of |IPCSupport|, initialized by |InitIPCSupport()| and reset by
-// |ShutdownIPCSupport()|. This is declared here so that
-// |mojo::embedder::test::Shutdown()| can check that it's only called after
-// |ShutdownIPCSupport()|.
-extern system::IPCSupport* g_ipc_support;
-
+extern Core* g_core;
+extern base::TaskRunner* g_delegate_thread_task_runner;
+extern ProcessDelegate* g_process_delegate;
+extern base::TaskRunner* g_io_thread_task_runner;
+
+// Called on the IO thread.
+void ChannelStarted();
+void ChannelShutdown();
} // namespace internal
-} // namepace embedder
+} // namepace edk
} // namespace mojo

Powered by Google App Engine
This is Rietveld 408576698