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

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

Issue 14846004: Migrate ProxyConfigServiceImpl to NetworkStateHandler and NetworkProfileHandler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 7 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 | « chromeos/network/network_state.cc ('k') | net/proxy/proxy_config.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 7
8 #include <string> 8 #include <string>
9 9
10 #include "googleurl/src/gurl.h" 10 #include "googleurl/src/gurl.h"
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 bool Equals(const ProxyConfig& other) const; 163 bool Equals(const ProxyConfig& other) const;
164 164
165 // Returns true if this config contains any "automatic" settings. See the 165 // Returns true if this config contains any "automatic" settings. See the
166 // class description for what that means. 166 // class description for what that means.
167 bool HasAutomaticSettings() const; 167 bool HasAutomaticSettings() const;
168 168
169 void ClearAutomaticSettings(); 169 void ClearAutomaticSettings();
170 170
171 // Creates a Value dump of this configuration. The caller is responsible for 171 // Creates a Value dump of this configuration. The caller is responsible for
172 // deleting the returned value. 172 // deleting the returned value.
173 base::Value* ToValue() const; 173 base::DictionaryValue* ToValue() const;
174 174
175 ProxyRules& proxy_rules() { 175 ProxyRules& proxy_rules() {
176 return proxy_rules_; 176 return proxy_rules_;
177 } 177 }
178 178
179 const ProxyRules& proxy_rules() const { 179 const ProxyRules& proxy_rules() const {
180 return proxy_rules_; 180 return proxy_rules_;
181 } 181 }
182 182
183 void set_pac_url(const GURL& url) { 183 void set_pac_url(const GURL& url) {
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 ProxyConfigSource source_; 254 ProxyConfigSource source_;
255 255
256 ID id_; 256 ID id_;
257 }; 257 };
258 258
259 } // namespace net 259 } // namespace net
260 260
261 261
262 262
263 #endif // NET_PROXY_PROXY_CONFIG_H_ 263 #endif // NET_PROXY_PROXY_CONFIG_H_
OLDNEW
« no previous file with comments | « chromeos/network/network_state.cc ('k') | net/proxy/proxy_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698