Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(681)

Unified Diff: components/data_reduction_proxy/core/browser/data_reduction_proxy_config.cc

Issue 1547273003: Set trusted SPDY proxy dynamically on per-profile basis (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_config.cc
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config.cc
index 4661367b041e1caa3b7075815377f12e2fb77511..6071b685d4481b582af0e848479e2b21b1b9c090 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config.cc
@@ -548,17 +548,22 @@ bool DataReductionProxyConfig::UsingHTTPTunnel(
return config_values_->UsingHTTPTunnel(proxy_server);
}
-// Returns true if the Data Reduction Proxy configuration may be used.
bool DataReductionProxyConfig::allowed() const {
+ DCHECK(thread_checker_.CalledOnValidThread());
return config_values_->allowed();
}
-// Returns true if the Data Reduction Proxy promo may be shown. This is not
-// tied to whether the Data Reduction Proxy is enabled.
bool DataReductionProxyConfig::promo_allowed() const {
+ DCHECK(thread_checker_.CalledOnValidThread());
return config_values_->promo_allowed();
}
+const std::vector<net::ProxyServer>&
+DataReductionProxyConfig::proxies_for_http() const {
+ DCHECK(thread_checker_.CalledOnValidThread());
+ return config_values_->proxies_for_http();
+}
+
void DataReductionProxyConfig::SetProxyConfig(bool enabled, bool at_startup) {
DCHECK(thread_checker_.CalledOnValidThread());
enabled_by_user_ = enabled;

Powered by Google App Engine
This is Rietveld 408576698