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

Side by Side Diff: chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_io_data.cc

Issue 830503004: Data Reduction Proxy blocking page and resources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@interstitalStep1
Patch Set: Add webui_resources.pak Created 5 years, 10 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 unified diff | Download patch
« no previous file with comments | « build/ios/grit_whitelist.txt ('k') | components/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_io_data.h" 5 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_io_data.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h" 10 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
11 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_fact ory.h" 11 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_fact ory.h"
12 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_conf igurator.h" 12 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_conf igurator.h"
13 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_d ata.h" 13 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_d ata.h"
14 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_stat istics_prefs.h" 14 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_stat istics_prefs.h"
15 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_event _store.h" 15 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_event _store.h"
16 16
17 #if defined(ENABLE_DATA_REDUCTION_PROXY_DEBUGGING) 17 #if defined(ENABLE_DATA_REDUCTION_PROXY_DEBUGGING)
18 #include "chrome/browser/browser_process.h"
18 #include "components/data_reduction_proxy/content/browser/content_data_reduction _proxy_debug_ui_service.h" 19 #include "components/data_reduction_proxy/content/browser/content_data_reduction _proxy_debug_ui_service.h"
19 #endif 20 #endif
20 21
21 namespace content { 22 namespace content {
22 class BrowserContext; 23 class BrowserContext;
23 } 24 }
24 25
25 scoped_ptr<data_reduction_proxy::DataReductionProxyIOData> 26 scoped_ptr<data_reduction_proxy::DataReductionProxyIOData>
26 CreateDataReductionProxyChromeIOData( 27 CreateDataReductionProxyChromeIOData(
27 net::NetLog* net_log, 28 net::NetLog* net_log,
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 data_reduction_proxy_io_data->InitOnUIThread(prefs); 65 data_reduction_proxy_io_data->InitOnUIThread(prefs);
65 66
66 #if defined(ENABLE_DATA_REDUCTION_PROXY_DEBUGGING) 67 #if defined(ENABLE_DATA_REDUCTION_PROXY_DEBUGGING)
67 scoped_ptr<data_reduction_proxy::ContentDataReductionProxyDebugUIService> 68 scoped_ptr<data_reduction_proxy::ContentDataReductionProxyDebugUIService>
68 data_reduction_proxy_ui_service( 69 data_reduction_proxy_ui_service(
69 new data_reduction_proxy::ContentDataReductionProxyDebugUIService( 70 new data_reduction_proxy::ContentDataReductionProxyDebugUIService(
70 base::Bind(&data_reduction_proxy::DataReductionProxyConfigurator:: 71 base::Bind(&data_reduction_proxy::DataReductionProxyConfigurator::
71 GetProxyConfigOnIOThread, 72 GetProxyConfigOnIOThread,
72 base::Unretained( 73 base::Unretained(
73 data_reduction_proxy_io_data->configurator())), 74 data_reduction_proxy_io_data->configurator())),
74 ui_task_runner, io_task_runner)); 75 ui_task_runner, io_task_runner,
76 g_browser_process->GetApplicationLocale()));
75 data_reduction_proxy_io_data->set_debug_ui_service( 77 data_reduction_proxy_io_data->set_debug_ui_service(
76 data_reduction_proxy_ui_service.Pass()); 78 data_reduction_proxy_ui_service.Pass());
77 #endif 79 #endif
78 80
79 return data_reduction_proxy_io_data.Pass(); 81 return data_reduction_proxy_io_data.Pass();
80 } 82 }
OLDNEW
« no previous file with comments | « build/ios/grit_whitelist.txt ('k') | components/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698