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

Side by Side Diff: webrtc/libjingle/xmpp/xmpplogintask.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/xmppengineimpl.h ('k') | webrtc/libjingle/xmpp/xmpplogintask_unittest.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 /* 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_LOGINTASK_H_ 11 #ifndef WEBRTC_LIBJINGLE_XMPP_LOGINTASK_H_
12 #define WEBRTC_LIBJINGLE_XMPP_LOGINTASK_H_ 12 #define WEBRTC_LIBJINGLE_XMPP_LOGINTASK_H_
13 13
14 #include <memory>
14 #include <string> 15 #include <string>
15 #include <vector> 16 #include <vector>
16 17
17 #include "webrtc/libjingle/xmpp/jid.h" 18 #include "webrtc/libjingle/xmpp/jid.h"
18 #include "webrtc/libjingle/xmpp/xmppengine.h" 19 #include "webrtc/libjingle/xmpp/xmppengine.h"
19 #include "webrtc/base/logging.h" 20 #include "webrtc/base/logging.h"
20 #include "webrtc/base/scoped_ptr.h" 21 #include "webrtc/base/scoped_ptr.h"
21 22
22 namespace buzz { 23 namespace buzz {
23 24
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 bool Failure(XmppEngine::Error reason); 64 bool Failure(XmppEngine::Error reason);
64 void FlushQueuedStanzas(); 65 void FlushQueuedStanzas();
65 66
66 XmppEngineImpl * pctx_; 67 XmppEngineImpl * pctx_;
67 bool authNeeded_; 68 bool authNeeded_;
68 bool allowNonGoogleLogin_; 69 bool allowNonGoogleLogin_;
69 LoginTaskState state_; 70 LoginTaskState state_;
70 const XmlElement * pelStanza_; 71 const XmlElement * pelStanza_;
71 bool isStart_; 72 bool isStart_;
72 std::string iqId_; 73 std::string iqId_;
73 rtc::scoped_ptr<XmlElement> pelFeatures_; 74 std::unique_ptr<XmlElement> pelFeatures_;
74 Jid fullJid_; 75 Jid fullJid_;
75 std::string streamId_; 76 std::string streamId_;
76 rtc::scoped_ptr<std::vector<XmlElement *> > pvecQueuedStanzas_; 77 std::unique_ptr<std::vector<XmlElement *> > pvecQueuedStanzas_;
77 78
78 rtc::scoped_ptr<SaslMechanism> sasl_mech_; 79 std::unique_ptr<SaslMechanism> sasl_mech_;
79 80
80 #if !defined(NDEBUG) 81 #if !defined(NDEBUG)
81 static const rtc::ConstantLabel LOGINTASK_STATES[]; 82 static const rtc::ConstantLabel LOGINTASK_STATES[];
82 #endif 83 #endif
83 }; 84 };
84 85
85 } 86 }
86 87
87 #endif // WEBRTC_LIBJINGLE_XMPP_LOGINTASK_H_ 88 #endif // WEBRTC_LIBJINGLE_XMPP_LOGINTASK_H_
OLDNEW
« no previous file with comments | « webrtc/libjingle/xmpp/xmppengineimpl.h ('k') | webrtc/libjingle/xmpp/xmpplogintask_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698