| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 IPC_IPC_CHANNEL_NACL_H_ | 5 #ifndef IPC_IPC_CHANNEL_NACL_H_ |
| 6 #define IPC_IPC_CHANNEL_NACL_H_ | 6 #define IPC_IPC_CHANNEL_NACL_H_ |
| 7 | 7 |
| 8 #include <deque> | 8 #include <deque> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 // don't change to something like std::deque<> without changing the | 113 // don't change to something like std::deque<> without changing the |
| 114 // implementation! | 114 // implementation! |
| 115 std::vector<int> input_fds_; | 115 std::vector<int> input_fds_; |
| 116 | 116 |
| 117 // This queue is used when a message is sent prior to Connect having been | 117 // This queue is used when a message is sent prior to Connect having been |
| 118 // called. Normally after we're connected, the queue is empty. | 118 // called. Normally after we're connected, the queue is empty. |
| 119 std::deque<linked_ptr<Message> > output_queue_; | 119 std::deque<linked_ptr<Message> > output_queue_; |
| 120 | 120 |
| 121 base::WeakPtrFactory<ChannelNacl> weak_ptr_factory_; | 121 base::WeakPtrFactory<ChannelNacl> weak_ptr_factory_; |
| 122 | 122 |
| 123 // |broker_| must outlive this instance. | |
| 124 AttachmentBroker* broker_; | |
| 125 | |
| 126 DISALLOW_IMPLICIT_CONSTRUCTORS(ChannelNacl); | 123 DISALLOW_IMPLICIT_CONSTRUCTORS(ChannelNacl); |
| 127 }; | 124 }; |
| 128 | 125 |
| 129 } // namespace IPC | 126 } // namespace IPC |
| 130 | 127 |
| 131 #endif // IPC_IPC_CHANNEL_NACL_H_ | 128 #endif // IPC_IPC_CHANNEL_NACL_H_ |
| OLD | NEW |