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

Side by Side Diff: mojo/edk/system/connection_manager.h

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
« no previous file with comments | « mojo/edk/system/cond_var_unittest.cc ('k') | mojo/edk/system/core.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef MOJO_EDK_SYSTEM_CONNECTION_MANAGER_H_ 5 #ifndef MOJO_EDK_SYSTEM_CONNECTION_MANAGER_H_
6 #define MOJO_EDK_SYSTEM_CONNECTION_MANAGER_H_ 6 #define MOJO_EDK_SYSTEM_CONNECTION_MANAGER_H_
7 7
8 #include <ostream> 8 #include <ostream>
9 9
10 #include "mojo/edk/system/connection_identifier.h" 10 #include "mojo/edk/system/connection_identifier.h"
11 #include "mojo/edk/system/process_identifier.h" 11 #include "mojo/edk/system/process_identifier.h"
12 #include "mojo/edk/system/thread_annotations.h" 12 #include "mojo/edk/util/thread_annotations.h"
13 #include "mojo/public/cpp/system/macros.h" 13 #include "mojo/public/cpp/system/macros.h"
14 14
15 namespace mojo { 15 namespace mojo {
16 16
17 namespace embedder { 17 namespace embedder {
18 class PlatformSupport; 18 class PlatformSupport;
19 class ScopedPlatformHandle; 19 class ScopedPlatformHandle;
20 } // namespace embedder 20 } // namespace embedder
21 21
22 namespace system { 22 namespace system {
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 // So logging macros and |DCHECK_EQ()|, etc. work. 123 // So logging macros and |DCHECK_EQ()|, etc. work.
124 inline std::ostream& operator<<(std::ostream& out, 124 inline std::ostream& operator<<(std::ostream& out,
125 ConnectionManager::Result result) { 125 ConnectionManager::Result result) {
126 return out << static_cast<int>(result); 126 return out << static_cast<int>(result);
127 } 127 }
128 128
129 } // namespace system 129 } // namespace system
130 } // namespace mojo 130 } // namespace mojo
131 131
132 #endif // MOJO_EDK_SYSTEM_CONNECTION_MANAGER_H_ 132 #endif // MOJO_EDK_SYSTEM_CONNECTION_MANAGER_H_
OLDNEW
« no previous file with comments | « mojo/edk/system/cond_var_unittest.cc ('k') | mojo/edk/system/core.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698