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

Side by Side Diff: third_party/mojo/src/mojo/edk/system/slave_connection_manager.cc

Issue 1019173002: Update mojo sdk to rev 7214b7ec7d27563b2666afad86cf1c5895c56c18 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Hack presentation service to persist callbacks 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "mojo/edk/system/slave_connection_manager.h" 5 #include "mojo/edk/system/slave_connection_manager.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
12 #include "mojo/edk/system/message_in_transit.h" 12 #include "mojo/edk/system/message_in_transit.h"
13 13
14 namespace mojo { 14 namespace mojo {
15 namespace system { 15 namespace system {
16 16
17 // SlaveConnectionManager ------------------------------------------------------ 17 // SlaveConnectionManager ------------------------------------------------------
18 18
19 SlaveConnectionManager::SlaveConnectionManager() 19 SlaveConnectionManager::SlaveConnectionManager(
20 : slave_process_delegate_(), 20 embedder::PlatformSupport* platform_support)
21 : ConnectionManager(platform_support),
22 slave_process_delegate_(),
21 private_thread_("SlaveConnectionManagerPrivateThread"), 23 private_thread_("SlaveConnectionManagerPrivateThread"),
22 awaiting_ack_type_(NOT_AWAITING_ACK), 24 awaiting_ack_type_(NOT_AWAITING_ACK),
23 ack_result_(), 25 ack_result_(),
24 ack_peer_process_identifier_(), 26 ack_peer_process_identifier_(),
25 ack_platform_handle_(), 27 ack_platform_handle_(),
26 event_(false, false) { // Auto-reset, not initially signalled. 28 event_(false, false) { // Auto-reset, not initially signalled.
27 } 29 }
28 30
29 SlaveConnectionManager::~SlaveConnectionManager() { 31 SlaveConnectionManager::~SlaveConnectionManager() {
30 DCHECK(!delegate_thread_task_runner_); 32 DCHECK(!delegate_thread_task_runner_);
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 } 304 }
303 305
304 void SlaveConnectionManager::AssertOnPrivateThread() const { 306 void SlaveConnectionManager::AssertOnPrivateThread() const {
305 // This should only be called after |Init()| and before |Shutdown()|. 307 // This should only be called after |Init()| and before |Shutdown()|.
306 DCHECK(private_thread_.message_loop()); 308 DCHECK(private_thread_.message_loop());
307 DCHECK_EQ(base::MessageLoop::current(), private_thread_.message_loop()); 309 DCHECK_EQ(base::MessageLoop::current(), private_thread_.message_loop());
308 } 310 }
309 311
310 } // namespace system 312 } // namespace system
311 } // namespace mojo 313 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698