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

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

Issue 382313003: Add data reduction functionality to all platforms. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove incorrect DCHECK from drp_statistics_prefs.cc Created 6 years, 3 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
« no previous file with comments | « chrome/browser/profiles/profile_impl_io_data.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 81f588c30f074d80c64d90cf17fa4eecd9b9853b..6bf1a30aa01895e7a138813cb0099d7e4e1d63de 100644
--- a/chrome/browser/profiles/profile_io_data.h
+++ b/chrome/browser/profiles/profile_io_data.h
@@ -23,6 +23,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/storage_partition_descriptor.h"
#include "components/content_settings/core/common/content_settings_types.h"
+#include "components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.h"
#include "components/data_reduction_proxy/browser/data_reduction_proxy_statistics_prefs.h"
#include "components/data_reduction_proxy/browser/data_reduction_proxy_usage_stats.h"
#include "content/public/browser/content_browser_client.h"
@@ -33,10 +34,6 @@
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_job_factory.h"
-#if defined(SPDY_PROXY_AUTH_ORIGIN)
-#include "components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.h"
-#endif // SPDY_PROXY_AUTH_ORIGIN
-
class ChromeHttpUserAgentSettings;
class ChromeNetworkDelegate;
class ChromeURLRequestContextGetter;
@@ -186,13 +183,11 @@ class ProfileIOData {
return &safe_browsing_enabled_;
}
-#if defined(SPDY_PROXY_AUTH_ORIGIN)
// TODO(feng): move the function to protected area.
// IsDataReductionProxyEnabled() should be used as public API.
BooleanPrefMember* data_reduction_proxy_enabled() const {
return &data_reduction_proxy_enabled_;
}
-#endif
BooleanPrefMember* printing_enabled() const {
return &printing_enabled_;
@@ -264,11 +259,9 @@ class ProfileIOData {
// should only be called from there.
bool GetMetricsEnabledStateOnIOThread() const;
-#if defined(OS_ANDROID)
// Returns whether or not data reduction proxy is enabled in the browser
// instance on which this profile resides.
bool IsDataReductionProxyEnabled() const;
-#endif
void set_client_cert_store_factory_for_testing(
const base::Callback<scoped_ptr<net::ClientCertStore>()>& factory) {
@@ -383,7 +376,6 @@ class ProfileIOData {
void set_channel_id_service(
net::ChannelIDService* channel_id_service) const;
-#if defined(SPDY_PROXY_AUTH_ORIGIN)
data_reduction_proxy::DataReductionProxyParams* data_reduction_proxy_params()
const {
return data_reduction_proxy_params_.get();
@@ -451,7 +443,6 @@ class ProfileIOData {
data_reduction_proxy_auth_request_handler_ =
data_reduction_proxy_auth_request_handler.Pass();
}
-#endif // defined(SPDY_PROXY_AUTH_ORIGIN)
ChromeNetworkDelegate* network_delegate() const {
return network_delegate_.get();
@@ -623,9 +614,7 @@ class ProfileIOData {
mutable BooleanPrefMember enable_do_not_track_;
mutable BooleanPrefMember force_safesearch_;
mutable BooleanPrefMember safe_browsing_enabled_;
-#if defined(SPDY_PROXY_AUTH_ORIGIN)
mutable BooleanPrefMember data_reduction_proxy_enabled_;
-#endif
mutable BooleanPrefMember printing_enabled_;
mutable BooleanPrefMember sync_disabled_;
mutable BooleanPrefMember signin_allowed_;
@@ -656,7 +645,6 @@ class ProfileIOData {
#endif
mutable scoped_ptr<net::ChannelIDService> channel_id_service_;
-#if defined(SPDY_PROXY_AUTH_ORIGIN)
// data_reduction_proxy_* classes must be declared before |network_delegate_|.
// The data_reduction_proxy_* classes are passed in to |network_delegate_|,
// so this ordering ensures that the |network_delegate_| never references
@@ -672,7 +660,6 @@ class ProfileIOData {
data_reduction_proxy_chrome_configurator_;
mutable scoped_ptr<data_reduction_proxy::DataReductionProxyAuthRequestHandler>
data_reduction_proxy_auth_request_handler_;
-#endif // defined(SPDY_PROXY_AUTH_ORIGIN)
mutable scoped_ptr<ChromeNetworkDelegate> network_delegate_;
mutable scoped_ptr<net::FraudulentCertificateReporter>
« no previous file with comments | « chrome/browser/profiles/profile_impl_io_data.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698