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

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

Issue 7605019: Reduce number of unnamed-type-template-args violations. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "net/proxy/proxy_config.h" 5 #include "net/proxy/proxy_config.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/string_tokenizer.h" 8 #include "base/string_tokenizer.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 DCHECK_EQ(TYPE_PROXY_PER_SCHEME, type); 151 DCHECK_EQ(TYPE_PROXY_PER_SCHEME, type);
152 if (scheme == "http") 152 if (scheme == "http")
153 return &proxy_for_http; 153 return &proxy_for_http;
154 if (scheme == "https") 154 if (scheme == "https")
155 return &proxy_for_https; 155 return &proxy_for_https;
156 if (scheme == "ftp") 156 if (scheme == "ftp")
157 return &proxy_for_ftp; 157 return &proxy_for_ftp;
158 return NULL; // No mapping for this scheme. 158 return NULL; // No mapping for this scheme.
159 } 159 }
160 160
161 // static
162 const ProxyConfig::ID ProxyConfig::kInvalidConfigID = 0;
163
161 ProxyConfig::ProxyConfig() 164 ProxyConfig::ProxyConfig()
162 : auto_detect_(false), pac_mandatory_(false), id_(INVALID_ID) { 165 : auto_detect_(false), pac_mandatory_(false), id_(kInvalidConfigID) {
163 } 166 }
164 167
165 ProxyConfig::ProxyConfig(const ProxyConfig& config) 168 ProxyConfig::ProxyConfig(const ProxyConfig& config)
166 : auto_detect_(config.auto_detect_), 169 : auto_detect_(config.auto_detect_),
167 pac_url_(config.pac_url_), 170 pac_url_(config.pac_url_),
168 pac_mandatory_(config.pac_mandatory_), 171 pac_mandatory_(config.pac_mandatory_),
169 proxy_rules_(config.proxy_rules_), 172 proxy_rules_(config.proxy_rules_),
170 id_(config.id_) { 173 id_(config.id_) {
171 } 174 }
172 175
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 } 249 }
247 250
248 dict->Set("bypass_list", list); 251 dict->Set("bypass_list", list);
249 } 252 }
250 } 253 }
251 254
252 return dict; 255 return dict;
253 } 256 }
254 257
255 } // namespace net 258 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698