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

Unified Diff: third_party/mojo/src/mojo/edk/embedder/embedder.cc

Issue 1019173002: Update mojo sdk to rev 7214b7ec7d27563b2666afad86cf1c5895c56c18 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Keep permission service alive if embedder drops requests Created 5 years, 9 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.cc
diff --git a/third_party/mojo/src/mojo/edk/embedder/embedder.cc b/third_party/mojo/src/mojo/edk/embedder/embedder.cc
index a4997e7da72094fd8b400c02adc65b3fe5714585..58919fb29ed8190f5ade215d3d5bde0599f42e67 100644
--- a/third_party/mojo/src/mojo/edk/embedder/embedder.cc
+++ b/third_party/mojo/src/mojo/edk/embedder/embedder.cc
@@ -195,14 +195,16 @@ void InitIPCSupport(ProcessType process_type,
break;
case ProcessType::MASTER:
DCHECK(!platform_handle.is_valid()); // We wouldn't do anything with it.
- g_connection_manager = new system::MasterConnectionManager();
+ g_connection_manager =
+ new system::MasterConnectionManager(internal::g_platform_support);
static_cast<system::MasterConnectionManager*>(g_connection_manager)
->Init(g_delegate_thread_task_runner,
static_cast<MasterProcessDelegate*>(g_process_delegate));
break;
case ProcessType::SLAVE:
DCHECK(platform_handle.is_valid());
- g_connection_manager = new system::SlaveConnectionManager();
+ g_connection_manager =
+ new system::SlaveConnectionManager(internal::g_platform_support);
static_cast<system::SlaveConnectionManager*>(g_connection_manager)
->Init(g_delegate_thread_task_runner,
static_cast<SlaveProcessDelegate*>(g_process_delegate),
« no previous file with comments | « third_party/mojo/mojom_bindings_generator_variables.gypi ('k') | third_party/mojo/src/mojo/edk/system/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698