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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/proxy/proxy_resolver_perftest.cc ('k') | net/proxy/proxy_resolver_v8.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef NET_PROXY_PROXY_RESOLVER_V8_H_ 5 #ifndef NET_PROXY_PROXY_RESOLVER_V8_H_
6 #define NET_PROXY_PROXY_RESOLVER_V8_H_ 6 #define NET_PROXY_PROXY_RESOLVER_V8_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/scoped_ptr.h" 10 #include "base/scoped_ptr.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 ProxyInfo* results, 49 ProxyInfo* results,
50 CompletionCallback* /*callback*/, 50 CompletionCallback* /*callback*/,
51 RequestHandle* /*request*/); 51 RequestHandle* /*request*/);
52 virtual void CancelRequest(RequestHandle request); 52 virtual void CancelRequest(RequestHandle request);
53 53
54 ProxyResolverJSBindings* js_bindings() const { return js_bindings_.get(); } 54 ProxyResolverJSBindings* js_bindings() const { return js_bindings_.get(); }
55 55
56 private: 56 private:
57 // Context holds the Javascript state for the most recently loaded PAC 57 // Context holds the Javascript state for the most recently loaded PAC
58 // script. It corresponds with the data from the last call to 58 // script. It corresponds with the data from the last call to
59 // SetPacScriptByDataInternal(). 59 // SetPacScript().
60 class Context; 60 class Context;
61 61
62 // ProxyResolver implementation: 62 // ProxyResolver implementation:
63 virtual void SetPacScriptByDataInternal(const std::string& bytes); 63 virtual int SetPacScript(const GURL& /*pac_url*/,
64 64 const std::string& bytes,
65 CompletionCallback* /*callback*/);
65 scoped_ptr<Context> context_; 66 scoped_ptr<Context> context_;
66 67
67 scoped_ptr<ProxyResolverJSBindings> js_bindings_; 68 scoped_ptr<ProxyResolverJSBindings> js_bindings_;
68 69
69 DISALLOW_COPY_AND_ASSIGN(ProxyResolverV8); 70 DISALLOW_COPY_AND_ASSIGN(ProxyResolverV8);
70 }; 71 };
71 72
72 } // namespace net 73 } // namespace net
73 74
74 #endif // NET_PROXY_PROXY_RESOLVER_V8_H_ 75 #endif // NET_PROXY_PROXY_RESOLVER_V8_H_
OLDNEW
« 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