Chromium Code Reviews| Index: chrome/browser/profiles/profile_io_data.cc |
| diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc |
| index dcf3bcf9d593e80c22e8e293bff942b704ac5f2a..7466e19e7bd35078995fb1975f9dabf5537231ec 100644 |
| --- a/chrome/browser/profiles/profile_io_data.cc |
| +++ b/chrome/browser/profiles/profile_io_data.cc |
| @@ -97,6 +97,7 @@ |
| #if defined(OS_ANDROID) |
| #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h" |
| #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_factory_android.h" |
| +#include "components/data_reduction_proxy/common/data_reduction_proxy_switches.h" |
| #endif // defined(OS_ANDROID) |
| #if defined(OS_CHROMEOS) |
| @@ -840,6 +841,14 @@ bool ProfileIOData::GetMetricsEnabledStateOnIOThread() const { |
| #endif // defined(OS_CHROMEOS) |
| } |
| +#if defined(OS_ANDROID) |
| +bool ProfileIOData::IsDataReductionProxyEnabled() const { |
| + 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
|
| + CommandLine::ForCurrentProcess()->HasSwitch( |
| + data_reduction_proxy::switches::kEnableDataReductionProxy); |
| +} |
| +#endif |
| + |
| base::WeakPtr<net::HttpServerProperties> |
| ProfileIOData::http_server_properties() const { |
| return http_server_properties_->GetWeakPtr(); |
| @@ -1176,7 +1185,9 @@ void ProfileIOData::ShutdownOnUIThread() { |
| enable_metrics_.Destroy(); |
| #endif |
| safe_browsing_enabled_.Destroy(); |
| +#if defined(OS_ANDROID) |
| data_reduction_proxy_enabled_.Destroy(); |
| +#endif |
| printing_enabled_.Destroy(); |
| sync_disabled_.Destroy(); |
| signin_allowed_.Destroy(); |