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

Side by Side Diff: net/proxy/proxy_script_decider.h

Issue 1135373002: Updated NetLog::ParametersCallback & all related calbacks returning value as scoped_ptr<base::Value… Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « net/proxy/proxy_resolver_v8_tracing.cc ('k') | net/proxy/proxy_script_decider.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_SCRIPT_DECIDER_H_ 5 #ifndef NET_PROXY_PROXY_SCRIPT_DECIDER_H_
6 #define NET_PROXY_PROXY_SCRIPT_DECIDER_H_ 6 #define NET_PROXY_PROXY_SCRIPT_DECIDER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 WPAD_DNS, 94 WPAD_DNS,
95 CUSTOM 95 CUSTOM
96 }; 96 };
97 97
98 PacSource(Type type, const GURL& url) 98 PacSource(Type type, const GURL& url)
99 : type(type), url(url) {} 99 : type(type), url(url) {}
100 100
101 // Returns a Value representing the PacSource. |effective_pac_url| must 101 // Returns a Value representing the PacSource. |effective_pac_url| must
102 // be non-NULL and point to the URL derived from information contained in 102 // be non-NULL and point to the URL derived from information contained in
103 // |this|, if Type is not WPAD_DHCP. 103 // |this|, if Type is not WPAD_DHCP.
104 base::Value* NetLogCallback(const GURL* effective_pac_url, 104 scoped_ptr<base::Value> NetLogCallback(
105 NetLogCaptureMode capture_mode) const; 105 const GURL* effective_pac_url,
106 NetLogCaptureMode capture_mode) const;
106 107
107 Type type; 108 Type type;
108 GURL url; // Empty unless |type == PAC_SOURCE_CUSTOM|. 109 GURL url; // Empty unless |type == PAC_SOURCE_CUSTOM|.
109 }; 110 };
110 111
111 typedef std::vector<PacSource> PacSourceList; 112 typedef std::vector<PacSource> PacSourceList;
112 113
113 enum State { 114 enum State {
114 STATE_NONE, 115 STATE_NONE,
115 STATE_WAIT, 116 STATE_WAIT,
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 base::OneShotTimer<ProxyScriptDecider> quick_check_timer_; 199 base::OneShotTimer<ProxyScriptDecider> quick_check_timer_;
199 scoped_ptr<SingleRequestHostResolver> host_resolver_; 200 scoped_ptr<SingleRequestHostResolver> host_resolver_;
200 base::Time quick_check_start_time_; 201 base::Time quick_check_start_time_;
201 202
202 DISALLOW_COPY_AND_ASSIGN(ProxyScriptDecider); 203 DISALLOW_COPY_AND_ASSIGN(ProxyScriptDecider);
203 }; 204 };
204 205
205 } // namespace net 206 } // namespace net
206 207
207 #endif // NET_PROXY_PROXY_SCRIPT_DECIDER_H_ 208 #endif // NET_PROXY_PROXY_SCRIPT_DECIDER_H_
OLDNEW
« no previous file with comments | « net/proxy/proxy_resolver_v8_tracing.cc ('k') | net/proxy/proxy_script_decider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698