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

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

Issue 2885005: Move chrome/common/net/notifier to jingle/notifier so that it can be used by remoting/remoting.gyp. (Closed) Base URL: git://codf21.jail.google.com/chromium.git
Patch Set: rebased Created 10 years, 5 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
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 "chrome/common/net/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 "chrome/common/net/notifier/communicator/connection_options.h" 10 #include "jingle/notifier/communicator/connection_options.h"
11 #include "chrome/common/net/notifier/communicator/xmpp_connection_generator.h" 11 #include "jingle/notifier/communicator/xmpp_connection_generator.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 #include "talk/xmpp/xmppclientsettings.h" 14 #include "talk/xmpp/xmppclientsettings.h"
15 15
16 namespace notifier { 16 namespace notifier {
17 17
18 LoginSettings::LoginSettings(const buzz::XmppClientSettings& user_settings, 18 LoginSettings::LoginSettings(const buzz::XmppClientSettings& user_settings,
19 const ConnectionOptions& options, 19 const ConnectionOptions& options,
20 const std::string& lang, 20 const std::string& lang,
21 net::HostResolver* host_resolver, 21 net::HostResolver* host_resolver,
(...skipping 28 matching lines...) Expand all
50 server_override_.reset(new ServerInformation()); 50 server_override_.reset(new ServerInformation());
51 server_override_->server = server; 51 server_override_->server = server;
52 server_override_->special_port_magic = server_list_[0].special_port_magic; 52 server_override_->special_port_magic = server_list_[0].special_port_magic;
53 } 53 }
54 54
55 void LoginSettings::clear_server_override() { 55 void LoginSettings::clear_server_override() {
56 server_override_.reset(); 56 server_override_.reset();
57 } 57 }
58 58
59 } // namespace notifier 59 } // namespace notifier
OLDNEW
« no previous file with comments | « jingle/notifier/communicator/login_settings.h ('k') | jingle/notifier/communicator/product_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698