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

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

Issue 13006020: net: extract net/cert out of net/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 8 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
« no previous file with comments | « jingle/notifier/base/xmpp_connection_unittest.cc ('k') | net/base/asn1_util.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 // 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 <string> 5 #include <string>
6 6
7 #include "jingle/notifier/communicator/login_settings.h" 7 #include "jingle/notifier/communicator/login_settings.h"
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "jingle/notifier/base/server_information.h" 10 #include "jingle/notifier/base/server_information.h"
11 #include "net/base/cert_verifier.h" 11 #include "net/cert/cert_verifier.h"
12 #include "talk/base/common.h" 12 #include "talk/base/common.h"
13 #include "talk/base/socketaddress.h" 13 #include "talk/base/socketaddress.h"
14 14
15 namespace notifier { 15 namespace notifier {
16 16
17 LoginSettings::LoginSettings(const buzz::XmppClientSettings& user_settings, 17 LoginSettings::LoginSettings(const buzz::XmppClientSettings& user_settings,
18 const scoped_refptr<net::URLRequestContextGetter>& 18 const scoped_refptr<net::URLRequestContextGetter>&
19 request_context_getter, 19 request_context_getter,
20 const ServerList& default_servers, 20 const ServerList& default_servers,
21 bool try_ssltcp_first, 21 bool try_ssltcp_first,
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 } 63 }
64 64
65 ServerList LoginSettings::GetServersForTime(base::Time now) const { 65 ServerList LoginSettings::GetServersForTime(base::Time now) const {
66 return 66 return
67 (now < redirect_expiration_) ? 67 (now < redirect_expiration_) ?
68 ServerList(1, redirect_server_) : 68 ServerList(1, redirect_server_) :
69 default_servers_; 69 default_servers_;
70 } 70 }
71 71
72 } // namespace notifier 72 } // namespace notifier
OLDNEW
« no previous file with comments | « jingle/notifier/base/xmpp_connection_unittest.cc ('k') | net/base/asn1_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698