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

Unified Diff: third_party/mojo/src/mojo/edk/embedder/embedder_internal.h

Issue 1179733005: Update mojo sdk to rev bdbb0c7e396fc4044a8b194058d7a7e529715286 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update CommandBufferImpl (Binding::OnConnectionError is no more) Created 5 years, 6 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: third_party/mojo/src/mojo/edk/embedder/embedder_internal.h
diff --git a/third_party/mojo/src/mojo/edk/embedder/embedder_internal.h b/third_party/mojo/src/mojo/edk/embedder/embedder_internal.h
index 752d366dd99d52db785c455107b5bc8064dd4a07..6f201b81e65d6430955fa3b02657cd4e58ad3cbe 100644
--- a/third_party/mojo/src/mojo/edk/embedder/embedder_internal.h
+++ b/third_party/mojo/src/mojo/edk/embedder/embedder_internal.h
@@ -11,7 +11,7 @@
#include <stdint.h>
-#include "mojo/edk/embedder/process_type.h"
+#include "mojo/edk/system/channel_id.h"
namespace base {
class TaskRunner;
@@ -23,9 +23,7 @@ namespace system {
class ChannelManager;
class Core;
-
-// Duplicate from mojo/edk/system/channel_manager.h, to avoid including it.
-using ChannelId = uint64_t;
+class IPCSupport;
} // namespace system
@@ -52,11 +50,11 @@ extern PlatformSupport* g_platform_support;
// Instance of |Core| used by the system functions (|Mojo...()|).
extern system::Core* g_core;
-// Type of process initialized in |InitIPCSupport()| (set to |UNINITIALIZED| if
-// "outside" |InitIPCSupport()|/|ShutdownIPCSupport()|). This is declared here
-// so that |mojo::embedder::test::Shutdown()| can check that it's only called
-// after |ShutdownIPCSupport()|.
-extern ProcessType g_process_type;
+// 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;
} // namespace internal
« no previous file with comments | « third_party/mojo/src/mojo/edk/embedder/embedder.cc ('k') | third_party/mojo/src/mojo/edk/embedder/embedder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698