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

Unified Diff: net/proxy/proxy_resolver_winhttp.h

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_v8_unittest.cc ('k') | net/proxy/proxy_resolver_winhttp.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_resolver_winhttp.h
===================================================================
--- net/proxy/proxy_resolver_winhttp.h (revision 22399)
+++ net/proxy/proxy_resolver_winhttp.h (working copy)
@@ -30,8 +30,9 @@
private:
// ProxyResolver implementation:
- virtual void SetPacScriptByUrlInternal(const GURL& pac_url);
-
+ virtual int SetPacScript(const GURL& pac_url,
+ const std::string& /*pac_bytes*/,
+ CompletionCallback* /*callback*/);
bool OpenWinHttpSession();
void CloseWinHttpSession();
« no previous file with comments | « net/proxy/proxy_resolver_v8_unittest.cc ('k') | net/proxy/proxy_resolver_winhttp.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698