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

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

Issue 1426343002: EDK: Move mutex.*, cond_var.*, and thread_annotations.h to //mojo/edk/util. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: oops Created 5 years, 1 month 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/connection_manager_messages.h" 12 #include "mojo/edk/system/connection_manager_messages.h"
13 #include "mojo/edk/system/message_in_transit.h" 13 #include "mojo/edk/system/message_in_transit.h"
14 #include "mojo/edk/util/make_unique.h" 14 #include "mojo/edk/util/make_unique.h"
15 15
16 using mojo::util::MutexLocker;
17
16 namespace mojo { 18 namespace mojo {
17 namespace system { 19 namespace system {
18 20
19 // SlaveConnectionManager ------------------------------------------------------ 21 // SlaveConnectionManager ------------------------------------------------------
20 22
21 SlaveConnectionManager::SlaveConnectionManager( 23 SlaveConnectionManager::SlaveConnectionManager(
22 embedder::PlatformSupport* platform_support) 24 embedder::PlatformSupport* platform_support)
23 : ConnectionManager(platform_support), 25 : ConnectionManager(platform_support),
24 slave_process_delegate_(), 26 slave_process_delegate_(),
25 private_thread_("SlaveConnectionManagerPrivateThread"), 27 private_thread_("SlaveConnectionManagerPrivateThread"),
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 } 337 }
336 338
337 void SlaveConnectionManager::AssertOnPrivateThread() const { 339 void SlaveConnectionManager::AssertOnPrivateThread() const {
338 // This should only be called after |Init()| and before |Shutdown()|. 340 // This should only be called after |Init()| and before |Shutdown()|.
339 DCHECK(private_thread_.message_loop()); 341 DCHECK(private_thread_.message_loop());
340 DCHECK_EQ(base::MessageLoop::current(), private_thread_.message_loop()); 342 DCHECK_EQ(base::MessageLoop::current(), private_thread_.message_loop());
341 } 343 }
342 344
343 } // namespace system 345 } // namespace system
344 } // namespace mojo 346 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/edk/system/slave_connection_manager.h ('k') | mojo/edk/system/test_channel_endpoint_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698