OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/channel_manager.h" | 5 #include "mojo/edk/system/channel_manager.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
| 9 #include "base/logging.h" |
9 #include "mojo/edk/platform/platform_handle.h" | 10 #include "mojo/edk/platform/platform_handle.h" |
10 #include "mojo/edk/system/channel.h" | 11 #include "mojo/edk/system/channel.h" |
11 #include "mojo/edk/system/channel_endpoint.h" | 12 #include "mojo/edk/system/channel_endpoint.h" |
12 #include "mojo/edk/system/message_pipe_dispatcher.h" | 13 #include "mojo/edk/system/message_pipe_dispatcher.h" |
13 | 14 |
14 using mojo::platform::PlatformHandle; | 15 using mojo::platform::PlatformHandle; |
15 using mojo::platform::PlatformHandleWatcher; | 16 using mojo::platform::PlatformHandleWatcher; |
16 using mojo::platform::ScopedPlatformHandle; | 17 using mojo::platform::ScopedPlatformHandle; |
17 using mojo::platform::TaskRunner; | 18 using mojo::platform::TaskRunner; |
18 using mojo::util::MakeRefCounted; | 19 using mojo::util::MakeRefCounted; |
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
184 MutexLocker locker(&mutex_); | 185 MutexLocker locker(&mutex_); |
185 CHECK(channels_.find(channel_id) == channels_.end()); | 186 CHECK(channels_.find(channel_id) == channels_.end()); |
186 channels_[channel_id] = channel; | 187 channels_[channel_id] = channel; |
187 } | 188 } |
188 channel->SetChannelManager(this); | 189 channel->SetChannelManager(this); |
189 return channel; | 190 return channel; |
190 } | 191 } |
191 | 192 |
192 } // namespace system | 193 } // namespace system |
193 } // namespace mojo | 194 } // namespace mojo |
OLD | NEW |