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

Unified Diff: net/proxy/proxy_resolver_mac.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.h ('k') | net/proxy/proxy_resolver_perftest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_resolver_mac.h
===================================================================
--- net/proxy/proxy_resolver_mac.h (revision 22399)
+++ net/proxy/proxy_resolver_mac.h (working copy)
@@ -8,6 +8,7 @@
#include <string>
#include "googleurl/src/gurl.h"
+#include "net/base/net_errors.h"
#include "net/proxy/proxy_config_service.h"
#include "net/proxy/proxy_resolver.h"
@@ -30,8 +31,11 @@
}
private:
- virtual void SetPacScriptByUrlInternal(const GURL& pac_url) {
+ virtual int SetPacScript(const GURL& pac_url,
+ const std::string& /*pac_bytes*/,
+ CompletionCallback* /*callback*/) {
pac_url_ = pac_url;
+ return OK;
}
GURL pac_url_;
« no previous file with comments | « net/proxy/proxy_resolver.h ('k') | net/proxy/proxy_resolver_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698