chrome/browser/profiles/profile_impl.cc - Issue 684223003: Data Reduction Proxy Interstitials

Unified Diff: chrome/browser/profiles/profile_impl.cc

Issue 684223003: Data Reduction Proxy Interstitials (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressing comments Created 6 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

« chrome/browser/about_flags.cc ('K') | « chrome/browser/about_flags.cc ('k') | chrome/browser/profiles/profile_impl_io_data.h » ('j') | chrome/browser/profiles/profile_impl_io_data.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/profile_impl.cc

diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc

index e1c618d837a0f2a9078fa7b75611591a7330bb5e..176ffc58778d88d3e281a1acd94756c19fd041db 100644

--- a/chrome/browser/profiles/profile_impl.cc

+++ b/chrome/browser/profiles/profile_impl.cc

@@ -112,6 +112,7 @@

#if defined(OS_ANDROID)

#include "chrome/browser/media/protected_media_identifier_permission_context.h"

#include "chrome/browser/media/protected_media_identifier_permission_context_factory.h"

+#include "components/data_reduction_proxy/content/browser/data_reduction_proxy_ui_service.h"

bengr 2014/12/17 00:30:19 Include unconditionally.

megjablon 2014/12/23 02:18:02 We decided not to have a base class as discussed o

#endif

#if defined(OS_CHROMEOS)

@@ -646,6 +647,11 @@ void ProfileImpl::DoFinalInit() {

scoped_ptr<data_reduction_proxy::DataReductionProxyStatisticsPrefs>

data_reduction_proxy_statistics_prefs;

scoped_ptr<data_reduction_proxy::DataReductionProxyEventStore> event_store;

+#if defined(OS_ANDROID)

+ scoped_ptr<data_reduction_proxy::DataReductionProxyUIService>

+ data_reduction_proxy_ui_service(

bengr 2014/12/17 00:30:19 Declare for all platforms and instantiate only if

megjablon 2014/12/23 02:18:03 We decided not to have a base class as discussed o

+ new data_reduction_proxy::DataReductionProxyUIService());

+#endif

DataReductionProxyChromeSettings* data_reduction_proxy_chrome_settings =

DataReductionProxyChromeSettingsFactory::GetForBrowserContext(this);

data_reduction_proxy_params =

@@ -713,7 +719,11 @@ void ProfileImpl::DoFinalInit() {

chrome_configurator.Pass(),

data_reduction_proxy_params.Pass(),

data_reduction_proxy_statistics_prefs.Pass(),

+#if defined(OS_ANDROID)

bengr 2014/12/17 00:30:19 Instead of changing the prototype for Android, pas

megjablon 2014/12/23 02:18:02 We decided not to have a base class as discussed o

+ data_reduction_proxy_ui_service.Pass(),

+#endif

event_store.Pass());

data_reduction_proxy_chrome_settings->InitDataReductionProxySettings(

data_reduction_proxy_chrome_configurator,

prefs_.get(),

« chrome/browser/about_flags.cc ('K') | « chrome/browser/about_flags.cc ('k') | chrome/browser/profiles/profile_impl_io_data.h » ('j') | chrome/browser/profiles/profile_impl_io_data.h » ('J')