OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "chrome/browser/net/chrome_url_request_context.h" | 5 #include "chrome/browser/net/chrome_url_request_context.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
10 #include "chrome/browser/privacy_blacklist/blacklist.h" | 10 #include "chrome/browser/privacy_blacklist/blacklist.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 #include "net/ftp/ftp_network_layer.h" | 23 #include "net/ftp/ftp_network_layer.h" |
24 #include "net/http/http_cache.h" | 24 #include "net/http/http_cache.h" |
25 #include "net/http/http_network_layer.h" | 25 #include "net/http/http_network_layer.h" |
26 #include "net/http/http_util.h" | 26 #include "net/http/http_util.h" |
27 #include "net/proxy/proxy_service.h" | 27 #include "net/proxy/proxy_service.h" |
28 #include "net/url_request/url_request.h" | 28 #include "net/url_request/url_request.h" |
29 #include "webkit/glue/webkit_glue.h" | 29 #include "webkit/glue/webkit_glue.h" |
30 | 30 |
31 net::ProxyConfig* CreateProxyConfig(const CommandLine& command_line) { | 31 net::ProxyConfig* CreateProxyConfig(const CommandLine& command_line) { |
32 // Scan for all "enable" type proxy switches. | 32 // Scan for all "enable" type proxy switches. |
33 static const wchar_t* proxy_switches[] = { | 33 static const char* proxy_switches[] = { |
34 switches::kProxyServer, | 34 switches::kProxyServer, |
35 switches::kProxyPacUrl, | 35 switches::kProxyPacUrl, |
36 switches::kProxyAutoDetect, | 36 switches::kProxyAutoDetect, |
37 switches::kProxyBypassList | 37 switches::kProxyBypassList |
38 }; | 38 }; |
39 | 39 |
40 bool found_enable_proxy_switch = false; | 40 bool found_enable_proxy_switch = false; |
41 for (size_t i = 0; i < arraysize(proxy_switches); i++) { | 41 for (size_t i = 0; i < arraysize(proxy_switches); i++) { |
42 if (command_line.HasSwitch(proxy_switches[i])) { | 42 if (command_line.HasSwitch(proxy_switches[i])) { |
43 found_enable_proxy_switch = true; | 43 found_enable_proxy_switch = true; |
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
539 appcache_service_->set_request_context(NULL); | 539 appcache_service_->set_request_context(NULL); |
540 | 540 |
541 NotificationService::current()->Notify( | 541 NotificationService::current()->Notify( |
542 NotificationType::URL_REQUEST_CONTEXT_RELEASED, | 542 NotificationType::URL_REQUEST_CONTEXT_RELEASED, |
543 Source<URLRequestContext>(this), | 543 Source<URLRequestContext>(this), |
544 NotificationService::NoDetails()); | 544 NotificationService::NoDetails()); |
545 | 545 |
546 delete ftp_transaction_factory_; | 546 delete ftp_transaction_factory_; |
547 delete http_transaction_factory_; | 547 delete http_transaction_factory_; |
548 } | 548 } |
OLD | NEW |