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

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

Issue 1942823002: Remove webrtc/base/scoped_ptr.h (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: fix additional scoped_ptr uses that had been added 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/hangoutpubsubclient.h ('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 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 <memory>
16 #include <string> 16 #include <string>
17 #include <vector> 17 #include <vector>
18 18
19 #include "webrtc/libjingle/xmllite/qname.h" 19 #include "webrtc/libjingle/xmllite/qname.h"
20 #include "webrtc/libjingle/xmllite/xmlelement.h" 20 #include "webrtc/libjingle/xmllite/xmlelement.h"
21 #include "webrtc/libjingle/xmpp/constants.h" 21 #include "webrtc/libjingle/xmpp/constants.h"
22 #include "webrtc/libjingle/xmpp/jid.h" 22 #include "webrtc/libjingle/xmpp/jid.h"
23 #include "webrtc/libjingle/xmpp/pubsubclient.h" 23 #include "webrtc/libjingle/xmpp/pubsubclient.h"
24 #include "webrtc/base/constructormagic.h" 24 #include "webrtc/base/constructormagic.h"
25 #include "webrtc/base/scoped_ptr.h"
26 #include "webrtc/base/sigslot.h" 25 #include "webrtc/base/sigslot.h"
27 #include "webrtc/base/sigslotrepeater.h" 26 #include "webrtc/base/sigslotrepeater.h"
28 27
29 namespace buzz { 28 namespace buzz {
30 29
31 // To handle retracts correctly, we need to remember certain details 30 // To handle retracts correctly, we need to remember certain details
32 // about an item. We could just cache the entire XML element, but 31 // about an item. We could just cache the entire XML element, but
33 // that would take more memory and require re-parsing. 32 // that would take more memory and require re-parsing.
34 struct StateItemInfo { 33 struct StateItemInfo {
35 std::string published_nick; 34 std::string published_nick;
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 // key => state 262 // key => state
264 std::map<std::string, C> state_by_key_; 263 std::map<std::string, C> state_by_key_;
265 // itemid => StateItemInfo 264 // itemid => StateItemInfo
266 std::map<std::string, StateItemInfo> info_by_itemid_; 265 std::map<std::string, StateItemInfo> info_by_itemid_;
267 266
268 RTC_DISALLOW_COPY_AND_ASSIGN(PubSubStateClient); 267 RTC_DISALLOW_COPY_AND_ASSIGN(PubSubStateClient);
269 }; 268 };
270 } // namespace buzz 269 } // namespace buzz
271 270
272 #endif // WEBRTC_LIBJINGLE_XMPP_PUBSUBSTATECLIENT_H_ 271 #endif // WEBRTC_LIBJINGLE_XMPP_PUBSUBSTATECLIENT_H_
OLDNEW
« no previous file with comments | « webrtc/libjingle/xmpp/hangoutpubsubclient.h ('k') | webrtc/libjingle/xmpp/xmpplogintask.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698