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

Side by Side Diff: webrtc/libjingle/xmpp/xmppclient.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/rostermoduleimpl.h ('k') | webrtc/libjingle/xmpp/xmppclient.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_XMPPCLIENT_H_ 11 #ifndef WEBRTC_LIBJINGLE_XMPP_XMPPCLIENT_H_
12 #define WEBRTC_LIBJINGLE_XMPP_XMPPCLIENT_H_ 12 #define WEBRTC_LIBJINGLE_XMPP_XMPPCLIENT_H_
13 13
14 #include <memory>
14 #include <string> 15 #include <string>
16
15 #include "webrtc/libjingle/xmpp/asyncsocket.h" 17 #include "webrtc/libjingle/xmpp/asyncsocket.h"
16 #include "webrtc/libjingle/xmpp/xmppclientsettings.h" 18 #include "webrtc/libjingle/xmpp/xmppclientsettings.h"
17 #include "webrtc/libjingle/xmpp/xmppengine.h" 19 #include "webrtc/libjingle/xmpp/xmppengine.h"
18 #include "webrtc/libjingle/xmpp/xmpptask.h" 20 #include "webrtc/libjingle/xmpp/xmpptask.h"
19 #include "webrtc/base/sigslot.h" 21 #include "webrtc/base/sigslot.h"
20 #include "webrtc/base/task.h" 22 #include "webrtc/base/task.h"
21 23
22 namespace buzz { 24 namespace buzz {
23 25
24 class PreXmppAuth; 26 class PreXmppAuth;
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 default: return Task::GetStateName(state); 131 default: return Task::GetStateName(state);
130 } 132 }
131 } 133 }
132 134
133 int ProcessTokenLogin(); 135 int ProcessTokenLogin();
134 int ProcessStartXmppLogin(); 136 int ProcessStartXmppLogin();
135 void EnsureClosed(); 137 void EnsureClosed();
136 138
137 class Private; 139 class Private;
138 friend class Private; 140 friend class Private;
139 rtc::scoped_ptr<Private> d_; 141 std::unique_ptr<Private> d_;
140 142
141 bool delivering_signal_; 143 bool delivering_signal_;
142 bool valid_; 144 bool valid_;
143 }; 145 };
144 146
145 } 147 }
146 148
147 #endif // WEBRTC_LIBJINGLE_XMPP_XMPPCLIENT_H_ 149 #endif // WEBRTC_LIBJINGLE_XMPP_XMPPCLIENT_H_
OLDNEW
« no previous file with comments | « webrtc/libjingle/xmpp/rostermoduleimpl.h ('k') | webrtc/libjingle/xmpp/xmppclient.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698