| 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 889 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 900 // Set ChromeURLRequestContext members | 900 // Set ChromeURLRequestContext members |
| 901 extension_info_ = other->extension_info_; | 901 extension_info_ = other->extension_info_; |
| 902 user_script_dir_path_ = other->user_script_dir_path_; | 902 user_script_dir_path_ = other->user_script_dir_path_; |
| 903 appcache_service_ = other->appcache_service_; | 903 appcache_service_ = other->appcache_service_; |
| 904 database_tracker_ = other->database_tracker_; | 904 database_tracker_ = other->database_tracker_; |
| 905 chrome_cookie_policy_ = other->chrome_cookie_policy_; | 905 chrome_cookie_policy_ = other->chrome_cookie_policy_; |
| 906 host_content_settings_map_ = other->host_content_settings_map_; | 906 host_content_settings_map_ = other->host_content_settings_map_; |
| 907 host_zoom_map_ = other->host_zoom_map_; | 907 host_zoom_map_ = other->host_zoom_map_; |
| 908 is_media_ = other->is_media_; | 908 is_media_ = other->is_media_; |
| 909 is_off_the_record_ = other->is_off_the_record_; | 909 is_off_the_record_ = other->is_off_the_record_; |
| 910 blob_storage_context_ = other->blob_storage_context_; |
| 910 } | 911 } |
| 911 | 912 |
| 912 void ChromeURLRequestContext::OnAcceptLanguageChange( | 913 void ChromeURLRequestContext::OnAcceptLanguageChange( |
| 913 const std::string& accept_language) { | 914 const std::string& accept_language) { |
| 914 CheckCurrentlyOnIOThread(); | 915 CheckCurrentlyOnIOThread(); |
| 915 accept_language_ = | 916 accept_language_ = |
| 916 net::HttpUtil::GenerateAcceptLanguageHeader(accept_language); | 917 net::HttpUtil::GenerateAcceptLanguageHeader(accept_language); |
| 917 } | 918 } |
| 918 | 919 |
| 919 void ChromeURLRequestContext::OnDefaultCharsetChange( | 920 void ChromeURLRequestContext::OnDefaultCharsetChange( |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 982 } | 983 } |
| 983 | 984 |
| 984 if (profile->GetUserScriptMaster()) | 985 if (profile->GetUserScriptMaster()) |
| 985 user_script_dir_path_ = profile->GetUserScriptMaster()->user_script_dir(); | 986 user_script_dir_path_ = profile->GetUserScriptMaster()->user_script_dir(); |
| 986 | 987 |
| 987 ssl_config_service_ = profile->GetSSLConfigService(); | 988 ssl_config_service_ = profile->GetSSLConfigService(); |
| 988 profile_dir_path_ = profile->GetPath(); | 989 profile_dir_path_ = profile->GetPath(); |
| 989 cookie_monster_delegate_ = new ChromeCookieMonsterDelegate(profile); | 990 cookie_monster_delegate_ = new ChromeCookieMonsterDelegate(profile); |
| 990 appcache_service_ = profile->GetAppCacheService(); | 991 appcache_service_ = profile->GetAppCacheService(); |
| 991 database_tracker_ = profile->GetDatabaseTracker(); | 992 database_tracker_ = profile->GetDatabaseTracker(); |
| 993 blob_storage_context_ = profile->GetBlobStorageContext(); |
| 992 } | 994 } |
| 993 | 995 |
| 994 ChromeURLRequestContextFactory::~ChromeURLRequestContextFactory() { | 996 ChromeURLRequestContextFactory::~ChromeURLRequestContextFactory() { |
| 995 CheckCurrentlyOnIOThread(); | 997 CheckCurrentlyOnIOThread(); |
| 996 } | 998 } |
| 997 | 999 |
| 998 void ChromeURLRequestContextFactory::ApplyProfileParametersToContext( | 1000 void ChromeURLRequestContextFactory::ApplyProfileParametersToContext( |
| 999 ChromeURLRequestContext* context) { | 1001 ChromeURLRequestContext* context) { |
| 1000 // Apply all the parameters. NOTE: keep this in sync with | 1002 // Apply all the parameters. NOTE: keep this in sync with |
| 1001 // ChromeURLRequestContextFactory(Profile*). | 1003 // ChromeURLRequestContextFactory(Profile*). |
| 1002 context->set_is_media(is_media_); | 1004 context->set_is_media(is_media_); |
| 1003 context->set_is_off_the_record(is_off_the_record_); | 1005 context->set_is_off_the_record(is_off_the_record_); |
| 1004 context->set_accept_language(accept_language_); | 1006 context->set_accept_language(accept_language_); |
| 1005 context->set_accept_charset(accept_charset_); | 1007 context->set_accept_charset(accept_charset_); |
| 1006 context->set_referrer_charset(referrer_charset_); | 1008 context->set_referrer_charset(referrer_charset_); |
| 1007 context->set_extension_info(extension_info_); | 1009 context->set_extension_info(extension_info_); |
| 1008 context->set_user_script_dir_path(user_script_dir_path_); | 1010 context->set_user_script_dir_path(user_script_dir_path_); |
| 1009 context->set_host_content_settings_map(host_content_settings_map_); | 1011 context->set_host_content_settings_map(host_content_settings_map_); |
| 1010 context->set_host_zoom_map(host_zoom_map_); | 1012 context->set_host_zoom_map(host_zoom_map_); |
| 1011 context->set_transport_security_state( | 1013 context->set_transport_security_state( |
| 1012 transport_security_state_); | 1014 transport_security_state_); |
| 1013 context->set_ssl_config_service(ssl_config_service_); | 1015 context->set_ssl_config_service(ssl_config_service_); |
| 1014 context->set_appcache_service(appcache_service_); | 1016 context->set_appcache_service(appcache_service_); |
| 1015 context->set_database_tracker(database_tracker_); | 1017 context->set_database_tracker(database_tracker_); |
| 1018 context->set_blob_storage_context(blob_storage_context_); |
| 1016 } | 1019 } |
| 1017 | 1020 |
| 1018 // ---------------------------------------------------------------------------- | 1021 // ---------------------------------------------------------------------------- |
| 1019 | 1022 |
| 1020 net::ProxyConfig* CreateProxyConfig(const PrefService* pref_service) { | 1023 net::ProxyConfig* CreateProxyConfig(const PrefService* pref_service) { |
| 1021 // Scan for all "enable" type proxy switches. | 1024 // Scan for all "enable" type proxy switches. |
| 1022 static const char* proxy_prefs[] = { | 1025 static const char* proxy_prefs[] = { |
| 1023 prefs::kProxyPacUrl, | 1026 prefs::kProxyPacUrl, |
| 1024 prefs::kProxyServer, | 1027 prefs::kProxyServer, |
| 1025 prefs::kProxyBypassList, | 1028 prefs::kProxyBypassList, |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1060 prefs::kProxyAutoDetect)); | 1063 prefs::kProxyAutoDetect)); |
| 1061 | 1064 |
| 1062 if (pref_service->HasPrefPath(prefs::kProxyBypassList)) { | 1065 if (pref_service->HasPrefPath(prefs::kProxyBypassList)) { |
| 1063 std::string proxy_bypass = | 1066 std::string proxy_bypass = |
| 1064 pref_service->GetString(prefs::kProxyBypassList); | 1067 pref_service->GetString(prefs::kProxyBypassList); |
| 1065 proxy_config->proxy_rules().bypass_rules.ParseFromString(proxy_bypass); | 1068 proxy_config->proxy_rules().bypass_rules.ParseFromString(proxy_bypass); |
| 1066 } | 1069 } |
| 1067 | 1070 |
| 1068 return proxy_config; | 1071 return proxy_config; |
| 1069 } | 1072 } |
| OLD | NEW |