| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_NODE_CONTROLLER_H_ | 5 #ifndef MOJO_EDK_SYSTEM_NODE_CONTROLLER_H_ |
| 6 #define MOJO_EDK_SYSTEM_NODE_CONTROLLER_H_ | 6 #define MOJO_EDK_SYSTEM_NODE_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include <queue> | 8 #include <queue> |
| 9 #include <unordered_map> | 9 #include <unordered_map> |
| 10 #include <unordered_set> | 10 #include <unordered_set> |
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 246 // All other fields below must only be accessed on the I/O thread, i.e., the | 246 // All other fields below must only be accessed on the I/O thread, i.e., the |
| 247 // thread on which core_->io_task_runner() runs tasks. | 247 // thread on which core_->io_task_runner() runs tasks. |
| 248 | 248 |
| 249 // Channels to children during handshake. | 249 // Channels to children during handshake. |
| 250 NodeMap pending_children_; | 250 NodeMap pending_children_; |
| 251 | 251 |
| 252 // Indicates whether this object should delete itself on IO thread shutdown. | 252 // Indicates whether this object should delete itself on IO thread shutdown. |
| 253 // Must only be accessed from the IO thread. | 253 // Must only be accessed from the IO thread. |
| 254 bool destroy_on_io_thread_shutdown_ = false; | 254 bool destroy_on_io_thread_shutdown_ = false; |
| 255 | 255 |
| 256 #if defined(OS_POSIX) | 256 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| 257 // Broker for sync shared buffer creation (posix-only) in children. | 257 // Broker for sync shared buffer creation (non-Mac posix-only) in children. |
| 258 scoped_ptr<Broker> broker_; | 258 scoped_ptr<Broker> broker_; |
| 259 #endif | 259 #endif |
| 260 | 260 |
| 261 DISALLOW_COPY_AND_ASSIGN(NodeController); | 261 DISALLOW_COPY_AND_ASSIGN(NodeController); |
| 262 }; | 262 }; |
| 263 | 263 |
| 264 } // namespace edk | 264 } // namespace edk |
| 265 } // namespace mojo | 265 } // namespace mojo |
| 266 | 266 |
| 267 #endif // MOJO_EDK_SYSTEM_NODE_CONTROLLER_H_ | 267 #endif // MOJO_EDK_SYSTEM_NODE_CONTROLLER_H_ |
| OLD | NEW |