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

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

Issue 1280973004: Returning scoped_ptr<> instead of raw pointer in ProxyConfig::ToValue (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | 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 "net/base/net_export.h" 10 #include "net/base/net_export.h"
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 // Returns true if the given config is equivalent to this config. The 167 // Returns true if the given config is equivalent to this config. The
168 // comparison ignores differences in |id()| and |source()|. 168 // comparison ignores differences in |id()| and |source()|.
169 bool Equals(const ProxyConfig& other) const; 169 bool Equals(const ProxyConfig& other) const;
170 170
171 // Returns true if this config contains any "automatic" settings. See the 171 // Returns true if this config contains any "automatic" settings. See the
172 // class description for what that means. 172 // class description for what that means.
173 bool HasAutomaticSettings() const; 173 bool HasAutomaticSettings() const;
174 174
175 void ClearAutomaticSettings(); 175 void ClearAutomaticSettings();
176 176
177 // Creates a Value dump of this configuration. The caller is responsible for 177 // Creates a Value dump of this configuration. The caller is responsible for
eroman 2015/08/10 22:12:42 Please delete the comment on ownership (as it is n
178 // deleting the returned value. 178 // deleting the returned value.
179 base::DictionaryValue* ToValue() const; 179 scoped_ptr<base::DictionaryValue> ToValue() const;
180 180
181 ProxyRules& proxy_rules() { 181 ProxyRules& proxy_rules() {
182 return proxy_rules_; 182 return proxy_rules_;
183 } 183 }
184 184
185 const ProxyRules& proxy_rules() const { 185 const ProxyRules& proxy_rules() const {
186 return proxy_rules_; 186 return proxy_rules_;
187 } 187 }
188 188
189 void set_pac_url(const GURL& url) { 189 void set_pac_url(const GURL& url) {
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 ProxyConfigSource source_; 260 ProxyConfigSource source_;
261 261
262 ID id_; 262 ID id_;
263 }; 263 };
264 264
265 } // namespace net 265 } // namespace net
266 266
267 267
268 268
269 #endif // NET_PROXY_PROXY_CONFIG_H_ 269 #endif // NET_PROXY_PROXY_CONFIG_H_
OLDNEW
« no previous file with comments | « no previous file | net/proxy/proxy_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698