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

Unified Diff: third_party/mojo/src/mojo/edk/system/master_connection_manager.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/system/master_connection_manager.cc
diff --git a/third_party/mojo/src/mojo/edk/system/master_connection_manager.cc b/third_party/mojo/src/mojo/edk/system/master_connection_manager.cc
index e98908dc0713406395a6ec7b01a5a483dd7b2494..f8dd7443a77ce3b84bdcbeb85237d486ebe0cff0 100644
--- a/third_party/mojo/src/mojo/edk/system/master_connection_manager.cc
+++ b/third_party/mojo/src/mojo/edk/system/master_connection_manager.cc
@@ -219,8 +219,10 @@ struct MasterConnectionManager::PendingConnectionInfo {
// MasterConnectionManager -----------------------------------------------------
-MasterConnectionManager::MasterConnectionManager()
- : master_process_delegate_(),
+MasterConnectionManager::MasterConnectionManager(
+ embedder::PlatformSupport* platform_support)
+ : ConnectionManager(platform_support),
+ master_process_delegate_(),
private_thread_("MasterConnectionManagerPrivateThread"),
next_process_identifier_(kFirstSlaveProcessIdentifier) {
}

Powered by Google App Engine
This is Rietveld 408576698