| OLD | NEW | 
|    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 "components/proxy_config/proxy_config_dictionary.h" |    5 #include "components/proxy_config/proxy_config_dictionary.h" | 
|    6  |    6  | 
|    7 #include "base/basictypes.h" |  | 
|    8 #include "base/logging.h" |    7 #include "base/logging.h" | 
|    9 #include "base/values.h" |    8 #include "base/values.h" | 
|   10 #include "net/proxy/proxy_config.h" |    9 #include "net/proxy/proxy_config.h" | 
|   11  |   10  | 
|   12 namespace { |   11 namespace { | 
|   13  |   12  | 
|   14 // Integer to specify the type of proxy settings. |   13 // Integer to specify the type of proxy settings. | 
|   15 // See ProxyPrefs for possible values and interactions with the other proxy |   14 // See ProxyPrefs for possible values and interactions with the other proxy | 
|   16 // preferences. |   15 // preferences. | 
|   17 const char kProxyMode[] = "mode"; |   16 const char kProxyMode[] = "mode"; | 
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  153  |  152  | 
|  154   if (!spec->empty()) |  153   if (!spec->empty()) | 
|  155     *spec += ';'; |  154     *spec += ';'; | 
|  156  |  155  | 
|  157   if (!url_scheme.empty()) { |  156   if (!url_scheme.empty()) { | 
|  158     *spec += url_scheme; |  157     *spec += url_scheme; | 
|  159     *spec += "="; |  158     *spec += "="; | 
|  160   } |  159   } | 
|  161   *spec += server.ToURI(); |  160   *spec += server.ToURI(); | 
|  162 } |  161 } | 
| OLD | NEW |