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

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

Issue 910883002: Update mojo sdk to rev 8af2ccff2eee4bfca1043015abee30482a030b30 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Apply 9f87aeadbda22441b7d469e596f7bd7d0d73e2a8 (https://codereview.chromium.org/908973002/) Created 5 years, 10 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
« no previous file with comments | « third_party/mojo/src/mojo/edk/embedder/embedder.cc ('k') | third_party/mojo/src/mojo/edk/js/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 536e0dbe729cee53d1badb105dbdda4ec65d4e01..7d90148ab2179125dd98d825467d5bc52ee974b5 100644
--- a/third_party/mojo/src/mojo/edk/embedder/embedder_internal.h
+++ b/third_party/mojo/src/mojo/edk/embedder/embedder_internal.h
@@ -26,6 +26,9 @@ typedef uint64_t ChannelId;
namespace embedder {
class PlatformSupport;
+// TODO(vtl): Remove these (see below).
+class MasterProcessDelegate;
+class SlaveProcessDelegate;
// 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
@@ -49,6 +52,12 @@ extern system::Core* g_core;
// (|mojo::embedder::CreateChannel()|, etc.).
extern system::ChannelManager* g_channel_manager;
+// TODO(vtl): Remove these: We'll eventually really want to hold on to a
+// |MasterConnectionManager*| or a |SlaveConnectionManager*|. For now, keep
+// these around as globals to avoid triggering leak detectors.
+extern MasterProcessDelegate* g_master_process_delegate;
+extern SlaveProcessDelegate* g_slave_process_delegate;
+
} // namespace internal
} // namepace embedder
« no previous file with comments | « third_party/mojo/src/mojo/edk/embedder/embedder.cc ('k') | third_party/mojo/src/mojo/edk/js/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698