| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/message_loop.h" | 8 #include "base/message_loop.h" |
| 9 #include "base/message_loop_proxy.h" | 9 #include "base/message_loop_proxy.h" |
| 10 #include "base/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
| (...skipping 873 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 884 extension_info_.erase(iter); | 884 extension_info_.erase(iter); |
| 885 } else { | 885 } else { |
| 886 // NOTE: This can currently happen if we receive multiple unload | 886 // NOTE: This can currently happen if we receive multiple unload |
| 887 // notifications, e.g. setting incognito-enabled state for a | 887 // notifications, e.g. setting incognito-enabled state for a |
| 888 // disabled extension (e.g., via sync). See | 888 // disabled extension (e.g., via sync). See |
| 889 // http://code.google.com/p/chromium/issues/detail?id=50582 . | 889 // http://code.google.com/p/chromium/issues/detail?id=50582 . |
| 890 NOTREACHED() << id; | 890 NOTREACHED() << id; |
| 891 } | 891 } |
| 892 } | 892 } |
| 893 | 893 |
| 894 bool ChromeURLRequestContext::IsExternal() const { |
| 895 return false; |
| 896 } |
| 897 |
| 894 ChromeURLRequestContext::ChromeURLRequestContext( | 898 ChromeURLRequestContext::ChromeURLRequestContext( |
| 895 ChromeURLRequestContext* other) { | 899 ChromeURLRequestContext* other) { |
| 896 CheckCurrentlyOnIOThread(); | 900 CheckCurrentlyOnIOThread(); |
| 897 | 901 |
| 898 // Set URLRequestContext members | 902 // Set URLRequestContext members |
| 899 net_log_ = other->net_log_; | 903 net_log_ = other->net_log_; |
| 900 host_resolver_ = other->host_resolver_; | 904 host_resolver_ = other->host_resolver_; |
| 901 proxy_service_ = other->proxy_service_; | 905 proxy_service_ = other->proxy_service_; |
| 902 ssl_config_service_ = other->ssl_config_service_; | 906 ssl_config_service_ = other->ssl_config_service_; |
| 903 http_transaction_factory_ = other->http_transaction_factory_; | 907 http_transaction_factory_ = other->http_transaction_factory_; |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1083 prefs::kProxyAutoDetect)); | 1087 prefs::kProxyAutoDetect)); |
| 1084 | 1088 |
| 1085 if (pref_service->HasPrefPath(prefs::kProxyBypassList)) { | 1089 if (pref_service->HasPrefPath(prefs::kProxyBypassList)) { |
| 1086 std::string proxy_bypass = | 1090 std::string proxy_bypass = |
| 1087 pref_service->GetString(prefs::kProxyBypassList); | 1091 pref_service->GetString(prefs::kProxyBypassList); |
| 1088 proxy_config->proxy_rules().bypass_rules.ParseFromString(proxy_bypass); | 1092 proxy_config->proxy_rules().bypass_rules.ParseFromString(proxy_bypass); |
| 1089 } | 1093 } |
| 1090 | 1094 |
| 1091 return proxy_config; | 1095 return proxy_config; |
| 1092 } | 1096 } |
| OLD | NEW |