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

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

Issue 1154903003: "typedef Foo Bar" -> "using Bar = Foo" in //mojo/edk/.... (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 7 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 #ifndef MOJO_EDK_SYSTEM_MASTER_CONNECTION_MANAGER_H_ 5 #ifndef MOJO_EDK_SYSTEM_MASTER_CONNECTION_MANAGER_H_
6 #define MOJO_EDK_SYSTEM_MASTER_CONNECTION_MANAGER_H_ 6 #define MOJO_EDK_SYSTEM_MASTER_CONNECTION_MANAGER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/containers/hash_tables.h" 10 #include "base/containers/hash_tables.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "base/synchronization/lock.h" 13 #include "base/synchronization/lock.h"
14 #include "base/threading/thread.h" 14 #include "base/threading/thread.h"
15 #include "mojo/edk/embedder/scoped_platform_handle.h" 15 #include "mojo/edk/embedder/scoped_platform_handle.h"
16 #include "mojo/edk/system/connection_manager.h" 16 #include "mojo/edk/system/connection_manager.h"
17 #include "mojo/edk/system/system_impl_export.h" 17 #include "mojo/edk/system/system_impl_export.h"
18 18
19 namespace base { 19 namespace base {
20 class TaskRunner; 20 class TaskRunner;
21 class WaitableEvent; 21 class WaitableEvent;
22 } 22 }
23 23
24 namespace mojo { 24 namespace mojo {
25 25
26 namespace embedder { 26 namespace embedder {
27 class MasterProcessDelegate; 27 class MasterProcessDelegate;
28 typedef void* SlaveInfo; 28 using SlaveInfo = void*;
29 } 29 }
30 30
31 namespace system { 31 namespace system {
32 32
33 // The master process will always have this "process identifier". 33 // The master process will always have this "process identifier".
34 const ProcessIdentifier kMasterProcessIdentifier = 1; 34 const ProcessIdentifier kMasterProcessIdentifier = 1;
35 35
36 // The |ConnectionManager| implementation for the master process. 36 // The |ConnectionManager| implementation for the master process.
37 // 37 //
38 // This class is thread-safe (except that no public methods may be called from 38 // This class is thread-safe (except that no public methods may be called from
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 base::hash_map<ConnectionIdentifier, PendingConnectionInfo*> 146 base::hash_map<ConnectionIdentifier, PendingConnectionInfo*>
147 pending_connections_; // Owns its values. 147 pending_connections_; // Owns its values.
148 148
149 DISALLOW_COPY_AND_ASSIGN(MasterConnectionManager); 149 DISALLOW_COPY_AND_ASSIGN(MasterConnectionManager);
150 }; 150 };
151 151
152 } // namespace system 152 } // namespace system
153 } // namespace mojo 153 } // namespace mojo
154 154
155 #endif // MOJO_EDK_SYSTEM_MASTER_CONNECTION_MANAGER_H_ 155 #endif // MOJO_EDK_SYSTEM_MASTER_CONNECTION_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698