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

Side by Side Diff: webrtc/libjingle/xmpp/xmppengineimpl.h

Issue 1935893002: Replace scoped_ptr with unique_ptr in webrtc/libjingle/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 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
« no previous file with comments | « webrtc/libjingle/xmpp/xmppengine_unittest.cc ('k') | webrtc/libjingle/xmpp/xmpplogintask.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_LIBJINGLE_XMPP_XMPPENGINEIMPL_H_ 11 #ifndef WEBRTC_LIBJINGLE_XMPP_XMPPENGINEIMPL_H_
12 #define WEBRTC_LIBJINGLE_XMPP_XMPPENGINEIMPL_H_ 12 #define WEBRTC_LIBJINGLE_XMPP_XMPPENGINEIMPL_H_
13 13
14 #include <memory>
14 #include <sstream> 15 #include <sstream>
15 #include <vector> 16 #include <vector>
17
16 #include "webrtc/libjingle/xmpp/xmppengine.h" 18 #include "webrtc/libjingle/xmpp/xmppengine.h"
17 #include "webrtc/libjingle/xmpp/xmppstanzaparser.h" 19 #include "webrtc/libjingle/xmpp/xmppstanzaparser.h"
18 20
19 namespace buzz { 21 namespace buzz {
20 22
21 class XmppLoginTask; 23 class XmppLoginTask;
22 class XmppEngine; 24 class XmppEngine;
23 class XmppIqEntry; 25 class XmppIqEntry;
24 class SaslHandler; 26 class SaslHandler;
25 class SaslMechanism; 27 class SaslMechanism;
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 XmppStanzaParser stanza_parser_; 228 XmppStanzaParser stanza_parser_;
227 229
228 // state 230 // state
229 int engine_entered_; 231 int engine_entered_;
230 Jid user_jid_; 232 Jid user_jid_;
231 std::string password_; 233 std::string password_;
232 std::string requested_resource_; 234 std::string requested_resource_;
233 TlsOptions tls_option_; 235 TlsOptions tls_option_;
234 std::string tls_server_hostname_; 236 std::string tls_server_hostname_;
235 std::string tls_server_domain_; 237 std::string tls_server_domain_;
236 rtc::scoped_ptr<XmppLoginTask> login_task_; 238 std::unique_ptr<XmppLoginTask> login_task_;
237 std::string lang_; 239 std::string lang_;
238 240
239 int next_id_; 241 int next_id_;
240 Jid bound_jid_; 242 Jid bound_jid_;
241 State state_; 243 State state_;
242 bool encrypted_; 244 bool encrypted_;
243 Error error_code_; 245 Error error_code_;
244 int subcode_; 246 int subcode_;
245 rtc::scoped_ptr<XmlElement> stream_error_; 247 std::unique_ptr<XmlElement> stream_error_;
246 bool raised_reset_; 248 bool raised_reset_;
247 XmppOutputHandler* output_handler_; 249 XmppOutputHandler* output_handler_;
248 XmppSessionHandler* session_handler_; 250 XmppSessionHandler* session_handler_;
249 251
250 XmlnsStack xmlns_stack_; 252 XmlnsStack xmlns_stack_;
251 253
252 typedef std::vector<XmppStanzaHandler*> StanzaHandlerVector; 254 typedef std::vector<XmppStanzaHandler*> StanzaHandlerVector;
253 rtc::scoped_ptr<StanzaHandlerVector> stanza_handlers_[HL_COUNT]; 255 std::unique_ptr<StanzaHandlerVector> stanza_handlers_[HL_COUNT];
254 256
255 typedef std::vector<XmppIqEntry*> IqEntryVector; 257 typedef std::vector<XmppIqEntry*> IqEntryVector;
256 rtc::scoped_ptr<IqEntryVector> iq_entries_; 258 std::unique_ptr<IqEntryVector> iq_entries_;
257 259
258 rtc::scoped_ptr<SaslHandler> sasl_handler_; 260 std::unique_ptr<SaslHandler> sasl_handler_;
259 261
260 rtc::scoped_ptr<std::stringstream> output_; 262 std::unique_ptr<std::stringstream> output_;
261 }; 263 };
262 264
263 } // namespace buzz 265 } // namespace buzz
264 266
265 #endif // WEBRTC_LIBJINGLE_XMPP_XMPPENGINEIMPL_H_ 267 #endif // WEBRTC_LIBJINGLE_XMPP_XMPPENGINEIMPL_H_
OLDNEW
« no previous file with comments | « webrtc/libjingle/xmpp/xmppengine_unittest.cc ('k') | webrtc/libjingle/xmpp/xmpplogintask.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698