net/proxy/proxy_resolver_mac.cc - Issue 149525: Remove the concept of threading from ProxyService, and move it into the Proxy...

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: net/proxy/proxy_resolver_mac.cc

Issue 149525: Remove the concept of threading from ProxyService, and move it into the Proxy... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Add missing header for mac Created 11 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 side-by-side diff with in-line comments

Download patch

Index: net/proxy/proxy_resolver_mac.cc

===================================================================

--- net/proxy/proxy_resolver_mac.cc (revision 21630)

+++ net/proxy/proxy_resolver_mac.cc (working copy)

@@ -243,8 +243,9 @@

// Gets the proxy information for a query URL from a PAC. Implementation

// inspired by http://developer.apple.com/samplecode/CFProxySupportTool/

int ProxyResolverMac::GetProxyForURL(const GURL& query_url,

- const GURL& pac_url,

- ProxyInfo* results) {

+ ProxyInfo* results,

+ CompletionCallback* /*callback*/,

+ RequestHandle* /*request*/) {

scoped_cftyperef<CFStringRef> query_ref(

base::SysUTF8ToCFStringRef(query_url.spec()));

scoped_cftyperef<CFURLRef> query_url_ref(

@@ -254,7 +255,7 @@

if (!query_url_ref.get())

return ERR_FAILED;

scoped_cftyperef<CFStringRef> pac_ref(

- base::SysUTF8ToCFStringRef(pac_url.spec()));

+ base::SysUTF8ToCFStringRef(pac_url_.spec()));

scoped_cftyperef<CFURLRef> pac_url_ref(

CFURLCreateWithString(kCFAllocatorDefault,

pac_ref.get(),

« no previous file with comments | « net/proxy/proxy_resolver_mac.h ('k') | net/proxy/proxy_resolver_perftest.cc » ('j') | no next file with comments »