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

Unified Diff: chrome/browser/profiles/profile_io_data.h

Issue 684223003: Data Reduction Proxy Interstitials (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update copyright year Created 5 years, 11 months 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: chrome/browser/profiles/profile_io_data.h
diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
index 966e86b3b7ae3fca755c43497010f2c8ab3c656b..aa5b96ac0f1357eea0e2d4e8249bd60ad448747c 100644
--- a/chrome/browser/profiles/profile_io_data.h
+++ b/chrome/browser/profiles/profile_io_data.h
@@ -35,6 +35,10 @@
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_job_factory.h"
+#if defined(OS_ANDROID)
+#include "components/data_reduction_proxy/content/browser/data_reduction_proxy_ui_service.h"
+#endif
+
class ChromeHttpUserAgentSettings;
class ChromeNetworkDelegate;
class ChromeURLRequestContextGetter;
@@ -50,6 +54,10 @@ namespace chrome_browser_net {
class ResourcePrefetchPredictorObserver;
}
+namespace data_reduction_proxy {
+class DataReductionProxyParams;
+}
+
namespace extensions {
class InfoMap;
}
@@ -206,6 +214,18 @@ class ProfileIOData {
return transport_security_state_.get();
}
+ data_reduction_proxy::DataReductionProxyParams* data_reduction_proxy_params()
+ const {
+ return data_reduction_proxy_params_.get();
+ }
+
+#if defined(OS_ANDROID)
+ data_reduction_proxy::DataReductionProxyUIService*
+ data_reduction_proxy_ui_service() const {
+ return data_reduction_proxy_ui_service_.get();
+ }
+#endif
+
#if defined(OS_CHROMEOS)
std::string username_hash() const {
return username_hash_;
@@ -367,11 +387,6 @@ class ProfileIOData {
void set_channel_id_service(
net::ChannelIDService* channel_id_service) const;
- data_reduction_proxy::DataReductionProxyParams* data_reduction_proxy_params()
- const {
- return data_reduction_proxy_params_.get();
- }
-
void set_data_reduction_proxy_params(
scoped_ptr<data_reduction_proxy::DataReductionProxyParams>
data_reduction_proxy_params) const {
@@ -447,6 +462,15 @@ class ProfileIOData {
data_reduction_proxy_event_store.Pass();
}
+#if defined(OS_ANDROID)
+ void set_data_reduction_proxy_ui_service(
+ scoped_ptr<data_reduction_proxy::DataReductionProxyUIService>
+ data_reduction_proxy_ui_service) const {
+ data_reduction_proxy_ui_service_ =
+ data_reduction_proxy_ui_service.Pass();
+ }
+#endif
+
net::FraudulentCertificateReporter* fraudulent_certificate_reporter() const {
return fraudulent_certificate_reporter_.get();
}
@@ -662,6 +686,12 @@ class ProfileIOData {
data_reduction_proxy_auth_request_handler_;
mutable scoped_ptr<data_reduction_proxy::DataReductionProxyEventStore>
data_reduction_proxy_event_store_;
+#if defined(OS_ANDROID)
+ // Must be declared after the DataReductionProxyChromeConfigurator, because
+ // the configurator must be valid for the service's entire lifetime.
+ mutable scoped_ptr<data_reduction_proxy::DataReductionProxyUIService>
+ data_reduction_proxy_ui_service_;
+#endif
mutable scoped_ptr<net::FraudulentCertificateReporter>
fraudulent_certificate_reporter_;

Powered by Google App Engine
This is Rietveld 408576698