summaryrefslogtreecommitdiffstats
path: root/jingle/notifier
diff options
context:
space:
mode:
Diffstat (limited to 'jingle/notifier')
-rw-r--r--jingle/notifier/communicator/login_settings.h4
-rw-r--r--jingle/notifier/communicator/xmpp_connection_generator.cc8
2 files changed, 6 insertions, 6 deletions
diff --git a/jingle/notifier/communicator/login_settings.h b/jingle/notifier/communicator/login_settings.h
index 32ea038..e2200e9 100644
--- a/jingle/notifier/communicator/login_settings.h
+++ b/jingle/notifier/communicator/login_settings.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -14,7 +14,7 @@ class XmppClientSettings;
}
namespace net {
-struct HostPortPair;
+class HostPortPair;
class HostResolver;
}
diff --git a/jingle/notifier/communicator/xmpp_connection_generator.cc b/jingle/notifier/communicator/xmpp_connection_generator.cc
index abadd35..5838840 100644
--- a/jingle/notifier/communicator/xmpp_connection_generator.cc
+++ b/jingle/notifier/communicator/xmpp_connection_generator.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
@@ -119,7 +119,7 @@ void XmppConnectionGenerator::UseNextConnection() {
const net::HostPortPair& server =
server_list_[server_index_].server;
net::HostResolver::RequestInfo request_info(
- server.host, server.port);
+ server.host(), server.port());
int status =
host_resolver_.Resolve(
request_info, &address_list_, resolve_callback_.get(),
@@ -175,9 +175,9 @@ void XmppConnectionGenerator::HandleServerDNSResolved(int status) {
settings_index_ = -1;
settings_list_->ClearPermutations();
settings_list_->AddPermutations(
- server_list_[server_index_].server.host,
+ server_list_[server_index_].server.host(),
ip_list,
- server_list_[server_index_].server.port,
+ server_list_[server_index_].server.port(),
server_list_[server_index_].special_port_magic,
proxy_only_);
}