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

Side by Side Diff: remoting/protocol/jingle_session.h

Issue 2314833002: Remove some uses of stl_util's STLDeleteContainerPointers. (Closed)
Patch Set: cleanup Created 4 years, 3 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
« no previous file with comments | « content/public/test/test_navigation_observer.cc ('k') | remoting/protocol/jingle_session.cc » ('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 (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 REMOTING_PROTOCOL_JINGLE_SESSION_H_ 5 #ifndef REMOTING_PROTOCOL_JINGLE_SESSION_H_
6 #define REMOTING_PROTOCOL_JINGLE_SESSION_H_ 6 #define REMOTING_PROTOCOL_JINGLE_SESSION_H_
7 7
8 #include <list> 8 #include <list>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 State state_; 123 State state_;
124 ErrorCode error_; 124 ErrorCode error_;
125 125
126 std::unique_ptr<SessionConfig> config_; 126 std::unique_ptr<SessionConfig> config_;
127 127
128 std::unique_ptr<Authenticator> authenticator_; 128 std::unique_ptr<Authenticator> authenticator_;
129 129
130 Transport* transport_ = nullptr; 130 Transport* transport_ = nullptr;
131 131
132 // Pending Iq requests. Used for all messages except transport-info. 132 // Pending Iq requests. Used for all messages except transport-info.
133 std::set<IqRequest*> pending_requests_; 133 std::set<std::unique_ptr<IqRequest>> pending_requests_;
134 134
135 // Pending transport-info requests. 135 // Pending transport-info requests.
136 std::list<IqRequest*> transport_info_requests_; 136 std::list<std::unique_ptr<IqRequest>> transport_info_requests_;
137 137
138 base::WeakPtrFactory<JingleSession> weak_factory_; 138 base::WeakPtrFactory<JingleSession> weak_factory_;
139 139
140 DISALLOW_COPY_AND_ASSIGN(JingleSession); 140 DISALLOW_COPY_AND_ASSIGN(JingleSession);
141 }; 141 };
142 142
143 } // namespace protocol 143 } // namespace protocol
144 } // namespace remoting 144 } // namespace remoting
145 145
146 #endif // REMOTING_PROTOCOL_JINGLE_SESSION_H_ 146 #endif // REMOTING_PROTOCOL_JINGLE_SESSION_H_
OLDNEW
« no previous file with comments | « content/public/test/test_navigation_observer.cc ('k') | remoting/protocol/jingle_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698