OLD | NEW |
1 // Copyright (c) 2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2008 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_resolver_mac.h" | 5 #include "net/proxy/proxy_resolver_mac.h" |
6 | 6 |
7 #include <CoreFoundation/CoreFoundation.h> | 7 #include <CoreFoundation/CoreFoundation.h> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/mac_util.h" | 10 #include "base/mac/mac_util.h" |
11 #include "base/mac/scoped_cftyperef.h" | 11 #include "base/mac/scoped_cftyperef.h" |
12 #include "base/string_util.h" | 12 #include "base/string_util.h" |
13 #include "base/sys_string_conversions.h" | 13 #include "base/sys_string_conversions.h" |
14 #include "net/base/net_errors.h" | 14 #include "net/base/net_errors.h" |
15 #include "net/proxy/proxy_info.h" | 15 #include "net/proxy/proxy_info.h" |
16 #include "net/proxy/proxy_server.h" | 16 #include "net/proxy/proxy_server.h" |
17 | 17 |
18 namespace { | 18 namespace { |
19 | 19 |
20 // Utility function to map a CFProxyType to a ProxyServer::Scheme. | 20 // Utility function to map a CFProxyType to a ProxyServer::Scheme. |
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
147 // - kCFProxyPasswordKey : Despite the existence of these keys in the | 147 // - kCFProxyPasswordKey : Despite the existence of these keys in the |
148 // documentation, they're never populated. Even if a | 148 // documentation, they're never populated. Even if a |
149 // username/password were to be set in the network | 149 // username/password were to be set in the network |
150 // proxy system preferences, we'd need to fetch it | 150 // proxy system preferences, we'd need to fetch it |
151 // from the Keychain ourselves. CFProxy is such a | 151 // from the Keychain ourselves. CFProxy is such a |
152 // tease. | 152 // tease. |
153 // - kCFProxyAutoConfigurationURLKey : If the PAC file specifies another | 153 // - kCFProxyAutoConfigurationURLKey : If the PAC file specifies another |
154 // PAC file, I'm going home. | 154 // PAC file, I'm going home. |
155 | 155 |
156 CFStringRef proxy_type = | 156 CFStringRef proxy_type = |
157 (CFStringRef)mac_util::GetValueFromDictionary(proxy_dictionary, | 157 (CFStringRef)base::mac::GetValueFromDictionary(proxy_dictionary, |
158 kCFProxyTypeKey, | 158 kCFProxyTypeKey, |
159 CFStringGetTypeID()); | 159 CFStringGetTypeID()); |
160 ProxyServer proxy_server = ProxyServer::FromDictionary( | 160 ProxyServer proxy_server = ProxyServer::FromDictionary( |
161 GetProxyServerScheme(proxy_type), | 161 GetProxyServerScheme(proxy_type), |
162 proxy_dictionary, | 162 proxy_dictionary, |
163 kCFProxyHostNameKey, | 163 kCFProxyHostNameKey, |
164 kCFProxyPortNumberKey); | 164 kCFProxyPortNumberKey); |
165 if (!proxy_server.is_valid()) | 165 if (!proxy_server.is_valid()) |
166 continue; | 166 continue; |
167 | 167 |
(...skipping 18 matching lines...) Expand all Loading... |
186 } | 186 } |
187 | 187 |
188 int ProxyResolverMac::SetPacScript( | 188 int ProxyResolverMac::SetPacScript( |
189 const scoped_refptr<ProxyResolverScriptData>& script_data, | 189 const scoped_refptr<ProxyResolverScriptData>& script_data, |
190 CompletionCallback* /*callback*/) { | 190 CompletionCallback* /*callback*/) { |
191 script_data_ = script_data; | 191 script_data_ = script_data; |
192 return OK; | 192 return OK; |
193 } | 193 } |
194 | 194 |
195 } // namespace net | 195 } // namespace net |
OLD | NEW |