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

Unified Diff: remoting/signaling/xmpp_signal_strategy.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/signaling/jingle_info_request.cc ('k') | remoting/signaling/xmpp_signal_strategy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/signaling/xmpp_signal_strategy.h
===================================================================
--- remoting/signaling/xmpp_signal_strategy.h (revision 287594)
+++ remoting/signaling/xmpp_signal_strategy.h (working copy)
@@ -18,17 +18,17 @@
#include "base/observer_list.h"
#include "base/threading/non_thread_safe.h"
#include "base/timer/timer.h"
-#include "third_party/libjingle/source/talk/base/sigslot.h"
#include "third_party/libjingle/source/talk/xmpp/xmppclient.h"
+#include "third_party/webrtc/base/sigslot.h"
namespace net {
class ClientSocketFactory;
class URLRequestContextGetter;
} // namespace net
-namespace talk_base {
+namespace rtc {
class TaskRunner;
-} // namespace talk_base
+} // namespace rtc
namespace remoting {
@@ -96,7 +96,7 @@
net::ClientSocketFactory* socket_factory_;
scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
std::string resource_name_;
- scoped_ptr<talk_base::TaskRunner> task_runner_;
+ scoped_ptr<rtc::TaskRunner> task_runner_;
buzz::XmppClient* xmpp_client_;
XmppServerConfig xmpp_server_config_;
« no previous file with comments | « remoting/signaling/jingle_info_request.cc ('k') | remoting/signaling/xmpp_signal_strategy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698