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

Side by Side Diff: jingle/notifier/base/xmpp_connection.h

Issue 450463002: Update webrtc&libjingle 6774:6825. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 // 4 //
5 // A class that manages a connection to an XMPP server. 5 // A class that manages a connection to an XMPP server.
6 6
7 #ifndef JINGLE_NOTIFIER_BASE_XMPP_CONNECTION_H_ 7 #ifndef JINGLE_NOTIFIER_BASE_XMPP_CONNECTION_H_
8 #define JINGLE_NOTIFIER_BASE_XMPP_CONNECTION_H_ 8 #define JINGLE_NOTIFIER_BASE_XMPP_CONNECTION_H_
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/gtest_prod_util.h" 11 #include "base/gtest_prod_util.h"
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
15 #include "base/threading/non_thread_safe.h" 15 #include "base/threading/non_thread_safe.h"
16 #include "net/url_request/url_request_context_getter.h" 16 #include "net/url_request/url_request_context_getter.h"
17 #include "talk/base/sigslot.h"
18 #include "talk/xmpp/xmppengine.h" 17 #include "talk/xmpp/xmppengine.h"
18 #include "webrtc/base/sigslot.h"
19 19
20 namespace buzz { 20 namespace buzz {
21 class PreXmppAuth; 21 class PreXmppAuth;
22 class XmlElement; 22 class XmlElement;
23 class XmppClientSettings; 23 class XmppClientSettings;
24 class XmppTaskParentInterface; 24 class XmppTaskParentInterface;
25 } // namespace 25 } // namespace
26 26
27 namespace jingle_glue { 27 namespace jingle_glue {
28 class TaskPump; 28 class TaskPump;
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 FRIEND_TEST(XmppConnectionTest, MultipleConnect); 96 FRIEND_TEST(XmppConnectionTest, MultipleConnect);
97 FRIEND_TEST(XmppConnectionTest, ConnectThenError); 97 FRIEND_TEST(XmppConnectionTest, ConnectThenError);
98 FRIEND_TEST(XmppConnectionTest, TasksDontRunAfterXmppConnectionDestructor); 98 FRIEND_TEST(XmppConnectionTest, TasksDontRunAfterXmppConnectionDestructor);
99 99
100 DISALLOW_COPY_AND_ASSIGN(XmppConnection); 100 DISALLOW_COPY_AND_ASSIGN(XmppConnection);
101 }; 101 };
102 102
103 } // namespace notifier 103 } // namespace notifier
104 104
105 #endif // JINGLE_NOTIFIER_BASE_XMPP_CONNECTION_H_ 105 #endif // JINGLE_NOTIFIER_BASE_XMPP_CONNECTION_H_
OLDNEW
« no previous file with comments | « jingle/notifier/base/weak_xmpp_client_unittest.cc ('k') | jingle/notifier/base/xmpp_connection_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698