| Index: chrome/browser/profiles/profile_impl_io_data.h
|
| diff --git a/chrome/browser/profiles/profile_impl_io_data.h b/chrome/browser/profiles/profile_impl_io_data.h
|
| index 50570632f33c081d7a377892094bd6e92a4c6090..cec50a30a22e02c14c8ac8bfd725c07df82bfd7d 100644
|
| --- a/chrome/browser/profiles/profile_impl_io_data.h
|
| +++ b/chrome/browser/profiles/profile_impl_io_data.h
|
| @@ -155,8 +155,12 @@ class ProfileImplIOData : public ProfileIOData {
|
|
|
| bool IsDataReductionProxyEnabled() const override;
|
|
|
| - BooleanPrefMember* data_reduction_proxy_enabled() const {
|
| - return &data_reduction_proxy_enabled_;
|
| + BooleanPrefMember* data_reduction_proxy_enabled_io() const {
|
| + return &data_reduction_proxy_enabled_io_;
|
| + }
|
| +
|
| + BooleanPrefMember* data_reduction_proxy_enabled_ui() const {
|
| + return &data_reduction_proxy_enabled_ui_;
|
| }
|
|
|
| private:
|
| @@ -182,10 +186,12 @@ class ProfileImplIOData : public ProfileIOData {
|
| ProfileImplIOData();
|
| ~ProfileImplIOData() override;
|
|
|
| - void InitializeInternal(ProfileParams* profile_params,
|
| - content::ProtocolHandlerMap* protocol_handlers,
|
| - content::URLRequestInterceptorScopedVector
|
| - request_interceptors) const override;
|
| + void InitializeInternal(
|
| + scoped_ptr<ChromeNetworkDelegate> chrome_network_delegate,
|
| + ProfileParams* profile_params,
|
| + content::ProtocolHandlerMap* protocol_handlers,
|
| + content::URLRequestInterceptorScopedVector
|
| + request_interceptors) const override;
|
| void InitializeExtensionsRequestContext(
|
| ProfileParams* profile_params) const override;
|
| net::URLRequestContext* InitializeAppRequestContext(
|
| @@ -242,7 +248,8 @@ class ProfileImplIOData : public ProfileIOData {
|
| mutable scoped_ptr<net::SdchManager> sdch_manager_;
|
| mutable scoped_ptr<ChromeSdchPolicy> sdch_policy_;
|
|
|
| - mutable BooleanPrefMember data_reduction_proxy_enabled_;
|
| + mutable BooleanPrefMember data_reduction_proxy_enabled_io_;
|
| + mutable BooleanPrefMember data_reduction_proxy_enabled_ui_;
|
|
|
| // Parameters needed for isolated apps.
|
| base::FilePath profile_path_;
|
|
|