Chromium Code Reviews| 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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 90 | 90 |
| 91 #if defined(ENABLE_MANAGED_USERS) | 91 #if defined(ENABLE_MANAGED_USERS) |
| 92 #include "chrome/browser/supervised_user/supervised_user_service.h" | 92 #include "chrome/browser/supervised_user/supervised_user_service.h" |
| 93 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" | 93 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" |
| 94 #include "chrome/browser/supervised_user/supervised_user_url_filter.h" | 94 #include "chrome/browser/supervised_user/supervised_user_url_filter.h" |
| 95 #endif | 95 #endif |
| 96 | 96 |
| 97 #if defined(OS_ANDROID) | 97 #if defined(OS_ANDROID) |
| 98 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h" | 98 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h" |
| 99 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_factory_and roid.h" | 99 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_factory_and roid.h" |
| 100 #include "components/data_reduction_proxy/common/data_reduction_proxy_switches.h " | |
| 100 #endif // defined(OS_ANDROID) | 101 #endif // defined(OS_ANDROID) |
| 101 | 102 |
| 102 #if defined(OS_CHROMEOS) | 103 #if defined(OS_CHROMEOS) |
| 103 #include "chrome/browser/chromeos/drive/drive_protocol_handler.h" | 104 #include "chrome/browser/chromeos/drive/drive_protocol_handler.h" |
| 104 #include "chrome/browser/chromeos/login/startup_utils.h" | 105 #include "chrome/browser/chromeos/login/startup_utils.h" |
| 105 #include "chrome/browser/chromeos/login/users/user.h" | 106 #include "chrome/browser/chromeos/login/users/user.h" |
| 106 #include "chrome/browser/chromeos/login/users/user_manager.h" | 107 #include "chrome/browser/chromeos/login/users/user_manager.h" |
| 107 #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h" | 108 #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h" |
| 108 #include "chrome/browser/chromeos/policy/policy_cert_service.h" | 109 #include "chrome/browser/chromeos/policy/policy_cert_service.h" |
| 109 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" | 110 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" |
| (...skipping 723 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 833 | 834 |
| 834 bool ProfileIOData::GetMetricsEnabledStateOnIOThread() const { | 835 bool ProfileIOData::GetMetricsEnabledStateOnIOThread() const { |
| 835 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 836 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| 836 #if defined(OS_CHROMEOS) | 837 #if defined(OS_CHROMEOS) |
| 837 return enable_metrics_; | 838 return enable_metrics_; |
| 838 #else | 839 #else |
| 839 return enable_metrics_.GetValue(); | 840 return enable_metrics_.GetValue(); |
| 840 #endif // defined(OS_CHROMEOS) | 841 #endif // defined(OS_CHROMEOS) |
| 841 } | 842 } |
| 842 | 843 |
| 844 #if defined(OS_ANDROID) | |
| 845 bool ProfileIOData::IsDataReductionProxyEnabled() const { | |
| 846 return data_reduction_proxy_enabled_.GetValue() || | |
|
bolian
2014/07/17 19:51:40
Can you use DataReductionProxySettings::IsDataRedu
Feng Qian
2014/07/17 20:00:13
There is an threading issue. Correct me if I am wr
bolian
2014/07/18 00:12:35
I am just afraid someone may forget to change this
| |
| 847 CommandLine::ForCurrentProcess()->HasSwitch( | |
| 848 data_reduction_proxy::switches::kEnableDataReductionProxy); | |
| 849 } | |
| 850 #endif | |
| 851 | |
| 843 base::WeakPtr<net::HttpServerProperties> | 852 base::WeakPtr<net::HttpServerProperties> |
| 844 ProfileIOData::http_server_properties() const { | 853 ProfileIOData::http_server_properties() const { |
| 845 return http_server_properties_->GetWeakPtr(); | 854 return http_server_properties_->GetWeakPtr(); |
| 846 } | 855 } |
| 847 | 856 |
| 848 void ProfileIOData::set_http_server_properties( | 857 void ProfileIOData::set_http_server_properties( |
| 849 scoped_ptr<net::HttpServerProperties> http_server_properties) const { | 858 scoped_ptr<net::HttpServerProperties> http_server_properties) const { |
| 850 http_server_properties_ = http_server_properties.Pass(); | 859 http_server_properties_ = http_server_properties.Pass(); |
| 851 } | 860 } |
| 852 | 861 |
| (...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1169 google_services_username_pattern_.Destroy(); | 1178 google_services_username_pattern_.Destroy(); |
| 1170 reverse_autologin_enabled_.Destroy(); | 1179 reverse_autologin_enabled_.Destroy(); |
| 1171 one_click_signin_rejected_email_list_.Destroy(); | 1180 one_click_signin_rejected_email_list_.Destroy(); |
| 1172 enable_referrers_.Destroy(); | 1181 enable_referrers_.Destroy(); |
| 1173 enable_do_not_track_.Destroy(); | 1182 enable_do_not_track_.Destroy(); |
| 1174 force_safesearch_.Destroy(); | 1183 force_safesearch_.Destroy(); |
| 1175 #if !defined(OS_CHROMEOS) | 1184 #if !defined(OS_CHROMEOS) |
| 1176 enable_metrics_.Destroy(); | 1185 enable_metrics_.Destroy(); |
| 1177 #endif | 1186 #endif |
| 1178 safe_browsing_enabled_.Destroy(); | 1187 safe_browsing_enabled_.Destroy(); |
| 1188 #if defined(OS_ANDROID) | |
| 1179 data_reduction_proxy_enabled_.Destroy(); | 1189 data_reduction_proxy_enabled_.Destroy(); |
| 1190 #endif | |
| 1180 printing_enabled_.Destroy(); | 1191 printing_enabled_.Destroy(); |
| 1181 sync_disabled_.Destroy(); | 1192 sync_disabled_.Destroy(); |
| 1182 signin_allowed_.Destroy(); | 1193 signin_allowed_.Destroy(); |
| 1183 // TODO(bnc): remove per https://crbug.com/334602. | 1194 // TODO(bnc): remove per https://crbug.com/334602. |
| 1184 network_prediction_enabled_.Destroy(); | 1195 network_prediction_enabled_.Destroy(); |
| 1185 network_prediction_options_.Destroy(); | 1196 network_prediction_options_.Destroy(); |
| 1186 quick_check_enabled_.Destroy(); | 1197 quick_check_enabled_.Destroy(); |
| 1187 if (media_device_id_salt_) | 1198 if (media_device_id_salt_) |
| 1188 media_device_id_salt_->ShutdownOnUIThread(); | 1199 media_device_id_salt_->ShutdownOnUIThread(); |
| 1189 session_startup_pref_.Destroy(); | 1200 session_startup_pref_.Destroy(); |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1251 void ProfileIOData::SetCookieSettingsForTesting( | 1262 void ProfileIOData::SetCookieSettingsForTesting( |
| 1252 CookieSettings* cookie_settings) { | 1263 CookieSettings* cookie_settings) { |
| 1253 DCHECK(!cookie_settings_.get()); | 1264 DCHECK(!cookie_settings_.get()); |
| 1254 cookie_settings_ = cookie_settings; | 1265 cookie_settings_ = cookie_settings; |
| 1255 } | 1266 } |
| 1256 | 1267 |
| 1257 void ProfileIOData::set_signin_names_for_testing( | 1268 void ProfileIOData::set_signin_names_for_testing( |
| 1258 SigninNamesOnIOThread* signin_names) { | 1269 SigninNamesOnIOThread* signin_names) { |
| 1259 signin_names_.reset(signin_names); | 1270 signin_names_.reset(signin_names); |
| 1260 } | 1271 } |
| OLD | NEW |