chrome/browser/extensions/extension_web_socket_proxy_private_api.cc - Issue 10309002: Reimplements net::AddressList without struct addrinfo.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/extension_web_socket_proxy_private_api.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

« chrome/browser/extensions/api/dns/dns_api.cc ('K') | « chrome/browser/extensions/api/socket/socket.cc ('k') | chrome/browser/net/network_stats.h » ('j') | chrome/browser/net/network_stats.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_web_socket_proxy_private_api.cc

diff --git a/chrome/browser/extensions/extension_web_socket_proxy_private_api.cc b/chrome/browser/extensions/extension_web_socket_proxy_private_api.cc

index be377c2c3177e2e3212830eb02c6ecbd4f6608c8..5532d3da382c327fccffef23e50fc8133f0b96fb 100644

--- a/chrome/browser/extensions/extension_web_socket_proxy_private_api.cc

+++ b/chrome/browser/extensions/extension_web_socket_proxy_private_api.cc

@@ -128,8 +128,8 @@ bool WebSocketProxyPrivate::RunImpl() {

void WebSocketProxyPrivate::OnHostResolution(int result) {

#if defined(OS_CHROMEOS)

- if (result == 0 && addr_.head() != NULL) {

- std::string ip = net::NetAddressToString(addr_.head());

+ if (result == 0 && !addr_.empty()) {

+ std::string ip = addr_.front().ToStringWithoutPort();

if (!ip.empty() && ip.find(':') != std::string::npos && ip[0] != '[')

ip = '[' + ip + ']';

map_["addr"] = ip;