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

Unified Diff: net/proxy/proxy_resolver_winhttp.cc

Issue 160510: Better match IE's proxy settings.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix merge conflict Created 11 years, 4 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
« no previous file with comments | « net/proxy/proxy_resolver_winhttp.h ('k') | net/proxy/proxy_script_fetcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_resolver_winhttp.cc
===================================================================
--- net/proxy/proxy_resolver_winhttp.cc (revision 22399)
+++ net/proxy/proxy_resolver_winhttp.cc (working copy)
@@ -70,8 +70,7 @@
options.fAutoLogonIfChallenged = FALSE;
options.dwFlags = WINHTTP_AUTOPROXY_CONFIG_URL;
std::wstring pac_url_wide = ASCIIToWide(pac_url_.spec());
- options.lpszAutoConfigUrl =
- pac_url_wide.empty() ? L"http://wpad/wpad.dat" : pac_url_wide.c_str();
+ options.lpszAutoConfigUrl = pac_url_wide.c_str();
WINHTTP_PROXY_INFO info = {0};
DCHECK(session_handle_);
@@ -140,8 +139,11 @@
NOTREACHED();
}
-void ProxyResolverWinHttp::SetPacScriptByUrlInternal(const GURL& pac_url) {
- pac_url_ = pac_url;
+int ProxyResolverWinHttp::SetPacScript(const GURL& pac_url,
+ const std::string& /*pac_bytes*/,
+ CompletionCallback* /*callback*/) {
+ pac_url_ = pac_url.is_valid() ? pac_url : GURL("http://wpad/wpad.dat");
+ return OK;
}
bool ProxyResolverWinHttp::OpenWinHttpSession() {
« no previous file with comments | « net/proxy/proxy_resolver_winhttp.h ('k') | net/proxy/proxy_script_fetcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698