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

Side by Side Diff: webrtc/libjingle/xmpp/pubsubstateclient.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
OLDNEW
1 /* 1 /*
2 * Copyright 2011 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2011 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_PUBSUBSTATECLIENT_H_ 11 #ifndef WEBRTC_LIBJINGLE_XMPP_PUBSUBSTATECLIENT_H_
12 #define WEBRTC_LIBJINGLE_XMPP_PUBSUBSTATECLIENT_H_ 12 #define WEBRTC_LIBJINGLE_XMPP_PUBSUBSTATECLIENT_H_
13 13
14 #include <map> 14 #include <map>
15 #include <memory>
15 #include <string> 16 #include <string>
16 #include <vector> 17 #include <vector>
17 18
18 #include "webrtc/libjingle/xmllite/qname.h" 19 #include "webrtc/libjingle/xmllite/qname.h"
19 #include "webrtc/libjingle/xmllite/xmlelement.h" 20 #include "webrtc/libjingle/xmllite/xmlelement.h"
20 #include "webrtc/libjingle/xmpp/constants.h" 21 #include "webrtc/libjingle/xmpp/constants.h"
21 #include "webrtc/libjingle/xmpp/jid.h" 22 #include "webrtc/libjingle/xmpp/jid.h"
22 #include "webrtc/libjingle/xmpp/pubsubclient.h" 23 #include "webrtc/libjingle/xmpp/pubsubclient.h"
23 #include "webrtc/base/constructormagic.h" 24 #include "webrtc/base/constructormagic.h"
24 #include "webrtc/base/scoped_ptr.h" 25 #include "webrtc/base/scoped_ptr.h"
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 // errors, so we simplify by making them both signal a publish 251 // errors, so we simplify by making them both signal a publish
251 // error. 252 // error.
252 const XmlElement* item = NULL; 253 const XmlElement* item = NULL;
253 SignalPublishError(task_id, item, stanza); 254 SignalPublishError(task_id, item, stanza);
254 } 255 }
255 256
256 std::string publisher_nick_; 257 std::string publisher_nick_;
257 PubSubClient* client_; 258 PubSubClient* client_;
258 const QName state_name_; 259 const QName state_name_;
259 C default_state_; 260 C default_state_;
260 rtc::scoped_ptr<PubSubStateKeySerializer> key_serializer_; 261 std::unique_ptr<PubSubStateKeySerializer> key_serializer_;
261 rtc::scoped_ptr<PubSubStateSerializer<C> > state_serializer_; 262 std::unique_ptr<PubSubStateSerializer<C> > state_serializer_;
262 // key => state 263 // key => state
263 std::map<std::string, C> state_by_key_; 264 std::map<std::string, C> state_by_key_;
264 // itemid => StateItemInfo 265 // itemid => StateItemInfo
265 std::map<std::string, StateItemInfo> info_by_itemid_; 266 std::map<std::string, StateItemInfo> info_by_itemid_;
266 267
267 RTC_DISALLOW_COPY_AND_ASSIGN(PubSubStateClient); 268 RTC_DISALLOW_COPY_AND_ASSIGN(PubSubStateClient);
268 }; 269 };
269 } // namespace buzz 270 } // namespace buzz
270 271
271 #endif // WEBRTC_LIBJINGLE_XMPP_PUBSUBSTATECLIENT_H_ 272 #endif // WEBRTC_LIBJINGLE_XMPP_PUBSUBSTATECLIENT_H_
OLDNEW
« no previous file with comments | « webrtc/libjingle/xmpp/pubsubclient_unittest.cc ('k') | webrtc/libjingle/xmpp/pubsubtasks_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698