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

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

Issue 10578017: Test GURL::spec() usage changes with DEPS rolled to the new version. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More fixes Created 8 years, 6 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/base/net_util.cc ('k') | net/url_request/view_cache_helper.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_CONFIG_H_ 5 #ifndef NET_PROXY_PROXY_CONFIG_H_
6 #define NET_PROXY_PROXY_CONFIG_H_ 6 #define NET_PROXY_PROXY_CONFIG_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 139
140 ProxyRules& proxy_rules() { 140 ProxyRules& proxy_rules() {
141 return proxy_rules_; 141 return proxy_rules_;
142 } 142 }
143 143
144 const ProxyRules& proxy_rules() const { 144 const ProxyRules& proxy_rules() const {
145 return proxy_rules_; 145 return proxy_rules_;
146 } 146 }
147 147
148 void set_pac_url(const GURL& url) { 148 void set_pac_url(const GURL& url) {
149 pac_url_ = url; 149 pac_url_ = url.is_valid() ? url : GURL();
150 } 150 }
151 151
152 const GURL& pac_url() const { 152 const GURL& pac_url() const {
153 return pac_url_; 153 return pac_url_;
154 } 154 }
155 155
156 void set_pac_mandatory(bool enable_pac_mandatory) { 156 void set_pac_mandatory(bool enable_pac_mandatory) {
157 pac_mandatory_ = enable_pac_mandatory; 157 pac_mandatory_ = enable_pac_mandatory;
158 } 158 }
159 159
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 ProxyConfigSource source_; 219 ProxyConfigSource source_;
220 220
221 ID id_; 221 ID id_;
222 }; 222 };
223 223
224 } // namespace net 224 } // namespace net
225 225
226 226
227 227
228 #endif // NET_PROXY_PROXY_CONFIG_H_ 228 #endif // NET_PROXY_PROXY_CONFIG_H_
OLDNEW
« no previous file with comments | « net/base/net_util.cc ('k') | net/url_request/view_cache_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698