OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/profiles/profile_io_data.h" | 5 #include "chrome/browser/profiles/profile_io_data.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 1010 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1021 network_delegate->set_extension_info_map( | 1021 network_delegate->set_extension_info_map( |
1022 profile_params_->extension_info_map.get()); | 1022 profile_params_->extension_info_map.get()); |
1023 #if defined(ENABLE_CONFIGURATION_POLICY) | 1023 #if defined(ENABLE_CONFIGURATION_POLICY) |
1024 network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get()); | 1024 network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get()); |
1025 #endif | 1025 #endif |
1026 network_delegate->set_profile(profile_params_->profile); | 1026 network_delegate->set_profile(profile_params_->profile); |
1027 network_delegate->set_profile_path(profile_params_->path); | 1027 network_delegate->set_profile_path(profile_params_->path); |
1028 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get()); | 1028 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get()); |
1029 network_delegate->set_enable_do_not_track(&enable_do_not_track_); | 1029 network_delegate->set_enable_do_not_track(&enable_do_not_track_); |
1030 network_delegate->set_force_google_safe_search(&force_safesearch_); | 1030 network_delegate->set_force_google_safe_search(&force_safesearch_); |
1031 #if defined(OS_ANDROID) | |
1032 network_delegate->set_data_reduction_proxy_enabled_pref( | |
1033 &data_reduction_proxy_enabled_); | |
1034 #endif | |
mmenke
2014/07/24 19:32:05
The other DRP variables are set unconditionally, l
megjablon
2014/07/24 20:09:37
The BooleanPrefMember only exists on Android curre
| |
1031 network_delegate->set_prerender_tracker(profile_params_->prerender_tracker); | 1035 network_delegate->set_prerender_tracker(profile_params_->prerender_tracker); |
1032 network_delegate_.reset(network_delegate); | 1036 network_delegate_.reset(network_delegate); |
1033 | 1037 |
1034 fraudulent_certificate_reporter_.reset( | 1038 fraudulent_certificate_reporter_.reset( |
1035 new chrome_browser_net::ChromeFraudulentCertificateReporter( | 1039 new chrome_browser_net::ChromeFraudulentCertificateReporter( |
1036 main_request_context_.get())); | 1040 main_request_context_.get())); |
1037 | 1041 |
1038 // NOTE: Proxy service uses the default io thread network delegate, not the | 1042 // NOTE: Proxy service uses the default io thread network delegate, not the |
1039 // delegate just created. | 1043 // delegate just created. |
1040 proxy_service_.reset( | 1044 proxy_service_.reset( |
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1269 void ProfileIOData::SetCookieSettingsForTesting( | 1273 void ProfileIOData::SetCookieSettingsForTesting( |
1270 CookieSettings* cookie_settings) { | 1274 CookieSettings* cookie_settings) { |
1271 DCHECK(!cookie_settings_.get()); | 1275 DCHECK(!cookie_settings_.get()); |
1272 cookie_settings_ = cookie_settings; | 1276 cookie_settings_ = cookie_settings; |
1273 } | 1277 } |
1274 | 1278 |
1275 void ProfileIOData::set_signin_names_for_testing( | 1279 void ProfileIOData::set_signin_names_for_testing( |
1276 SigninNamesOnIOThread* signin_names) { | 1280 SigninNamesOnIOThread* signin_names) { |
1277 signin_names_.reset(signin_names); | 1281 signin_names_.reset(signin_names); |
1278 } | 1282 } |
OLD | NEW |