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

Unified Diff: net/proxy/proxy_resolver_v8.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_perftest.cc ('k') | net/proxy/proxy_resolver_v8.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_resolver_v8.h
===================================================================
--- net/proxy/proxy_resolver_v8.h (revision 22399)
+++ net/proxy/proxy_resolver_v8.h (working copy)
@@ -56,12 +56,13 @@
private:
// Context holds the Javascript state for the most recently loaded PAC
// script. It corresponds with the data from the last call to
- // SetPacScriptByDataInternal().
+ // SetPacScript().
class Context;
// ProxyResolver implementation:
- virtual void SetPacScriptByDataInternal(const std::string& bytes);
-
+ virtual int SetPacScript(const GURL& /*pac_url*/,
+ const std::string& bytes,
+ CompletionCallback* /*callback*/);
scoped_ptr<Context> context_;
scoped_ptr<ProxyResolverJSBindings> js_bindings_;
« no previous file with comments | « net/proxy/proxy_resolver_perftest.cc ('k') | net/proxy/proxy_resolver_v8.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698