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

Unified Diff: chrome/browser/ui/webui/net_internals/net_internals_ui.cc

Issue 10309002: Reimplements net::AddressList without struct addrinfo. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added missing NET_EXPORT to *PortOnAddressList. Created 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/net_internals/net_internals_ui.cc
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
index 324bf0707b0a67e23775ea23ca3d8ccd0523770f..c5929069c12600fa10de69c382d0d03928cb7bea 100644
--- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
@@ -58,7 +58,6 @@
#include "net/base/host_resolver.h"
#include "net/base/net_errors.h"
#include "net/base/net_util.h"
-#include "net/base/sys_addrinfo.h"
#include "net/base/transport_security_state.h"
#include "net/base/x509_cert_types.h"
#include "net/disk_cache/disk_cache.h"
@@ -953,11 +952,10 @@ void NetInternalsMessageHandler::IOThreadImpl::OnGetHostResolverInfo(
} else {
// Append all of the resolved addresses.
ListValue* address_list = new ListValue();
- const struct addrinfo* current_address = entry.addrlist.head();
- while (current_address) {
- address_list->Append(Value::CreateStringValue(
- net::NetAddressToStringWithPort(current_address)));
- current_address = current_address->ai_next;
+ for (net::AddressList::const_iterator addr_it = entry.addrlist.begin();
eroman 2012/05/04 01:08:41 [optional] style nit: For vectors I actually much
+ addr_it != entry.addrlist.end(); ++addr_it) {
+ address_list->Append(
+ Value::CreateStringValue(addr_it->ToStringWithoutPort()));
}
entry_dict->Set("addresses", address_list);
}

Powered by Google App Engine
This is Rietveld 408576698