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

Side by Side Diff: webrtc/libjingle/xmpp/hangoutpubsubclient.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/fakexmppclient.h ('k') | webrtc/libjingle/xmpp/pubsubstateclient.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_HANGOUTPUBSUBCLIENT_H_ 11 #ifndef WEBRTC_LIBJINGLE_XMPP_HANGOUTPUBSUBCLIENT_H_
12 #define WEBRTC_LIBJINGLE_XMPP_HANGOUTPUBSUBCLIENT_H_ 12 #define WEBRTC_LIBJINGLE_XMPP_HANGOUTPUBSUBCLIENT_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/xmpp/jid.h" 19 #include "webrtc/libjingle/xmpp/jid.h"
20 #include "webrtc/libjingle/xmpp/pubsubclient.h" 20 #include "webrtc/libjingle/xmpp/pubsubclient.h"
21 #include "webrtc/libjingle/xmpp/pubsubstateclient.h" 21 #include "webrtc/libjingle/xmpp/pubsubstateclient.h"
22 #include "webrtc/base/scoped_ptr.h"
23 #include "webrtc/base/sigslot.h" 22 #include "webrtc/base/sigslot.h"
24 #include "webrtc/base/sigslotrepeater.h" 23 #include "webrtc/base/sigslotrepeater.h"
25 24
26 // Gives a high-level API for MUC call PubSub needs such as 25 // Gives a high-level API for MUC call PubSub needs such as
27 // presenter state, recording state, mute state, and remote mute. 26 // presenter state, recording state, mute state, and remote mute.
28 27
29 namespace buzz { 28 namespace buzz {
30 29
31 class Jid; 30 class Jid;
32 class XmlElement; 31 class XmlElement;
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 std::unique_ptr<PubSubStateClient<bool> > audio_mute_state_client_; 169 std::unique_ptr<PubSubStateClient<bool> > audio_mute_state_client_;
171 std::unique_ptr<PubSubStateClient<bool> > video_mute_state_client_; 170 std::unique_ptr<PubSubStateClient<bool> > video_mute_state_client_;
172 std::unique_ptr<PubSubStateClient<bool> > video_pause_state_client_; 171 std::unique_ptr<PubSubStateClient<bool> > video_pause_state_client_;
173 std::unique_ptr<PubSubStateClient<bool> > recording_state_client_; 172 std::unique_ptr<PubSubStateClient<bool> > recording_state_client_;
174 std::unique_ptr<PubSubStateClient<bool> > media_block_state_client_; 173 std::unique_ptr<PubSubStateClient<bool> > media_block_state_client_;
175 }; 174 };
176 175
177 } // namespace buzz 176 } // namespace buzz
178 177
179 #endif // WEBRTC_LIBJINGLE_XMPP_HANGOUTPUBSUBCLIENT_H_ 178 #endif // WEBRTC_LIBJINGLE_XMPP_HANGOUTPUBSUBCLIENT_H_
OLDNEW
« no previous file with comments | « webrtc/libjingle/xmpp/fakexmppclient.h ('k') | webrtc/libjingle/xmpp/pubsubstateclient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698