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

Side by Side Diff: jingle/notifier/communicator/login.cc

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 #include "jingle/notifier/communicator/login.h" 5 #include "jingle/notifier/communicator/login.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/rand_util.h" 10 #include "base/rand_util.h"
11 #include "base/time/time.h" 11 #include "base/time/time.h"
12 #include "net/base/host_port_pair.h" 12 #include "net/base/host_port_pair.h"
13 #include "talk/base/common.h"
14 #include "talk/base/firewallsocketserver.h"
15 #include "talk/base/logging.h"
16 #include "talk/base/physicalsocketserver.h"
17 #include "talk/base/taskrunner.h"
18 #include "talk/xmllite/xmlelement.h" 13 #include "talk/xmllite/xmlelement.h"
19 #include "talk/xmpp/asyncsocket.h" 14 #include "talk/xmpp/asyncsocket.h"
20 #include "talk/xmpp/prexmppauth.h" 15 #include "talk/xmpp/prexmppauth.h"
21 #include "talk/xmpp/xmppclient.h" 16 #include "talk/xmpp/xmppclient.h"
22 #include "talk/xmpp/xmppclientsettings.h" 17 #include "talk/xmpp/xmppclientsettings.h"
23 #include "talk/xmpp/xmppengine.h" 18 #include "talk/xmpp/xmppengine.h"
19 #include "webrtc/base/common.h"
20 #include "webrtc/base/firewallsocketserver.h"
21 #include "webrtc/base/logging.h"
22 #include "webrtc/base/physicalsocketserver.h"
23 #include "webrtc/base/taskrunner.h"
24 24
25 namespace notifier { 25 namespace notifier {
26 26
27 Login::Delegate::~Delegate() {} 27 Login::Delegate::~Delegate() {}
28 28
29 Login::Login(Delegate* delegate, 29 Login::Login(Delegate* delegate,
30 const buzz::XmppClientSettings& user_settings, 30 const buzz::XmppClientSettings& user_settings,
31 const scoped_refptr<net::URLRequestContextGetter>& 31 const scoped_refptr<net::URLRequestContextGetter>&
32 request_context_getter, 32 request_context_getter,
33 const ServerList& servers, 33 const ServerList& servers,
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 const base::TimeDelta kMaxReconnectInterval = 136 const base::TimeDelta kMaxReconnectInterval =
137 base::TimeDelta::FromMinutes(30); 137 base::TimeDelta::FromMinutes(30);
138 reconnect_interval_ *= 2; 138 reconnect_interval_ *= 2;
139 if (reconnect_interval_ > kMaxReconnectInterval) 139 if (reconnect_interval_ > kMaxReconnectInterval)
140 reconnect_interval_ = kMaxReconnectInterval; 140 reconnect_interval_ = kMaxReconnectInterval;
141 DVLOG(1) << "Reconnecting..."; 141 DVLOG(1) << "Reconnecting...";
142 StartConnection(); 142 StartConnection();
143 } 143 }
144 144
145 } // namespace notifier 145 } // namespace notifier
OLDNEW
« no previous file with comments | « jingle/notifier/communicator/connection_settings_unittest.cc ('k') | jingle/notifier/communicator/login_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698