OLD | NEW |
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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
65 data_reduction_proxy_io_data->InitOnUIThread(prefs); | 66 data_reduction_proxy_io_data->InitOnUIThread(prefs); |
66 | 67 |
67 #if defined(ENABLE_DATA_REDUCTION_PROXY_DEBUGGING) | 68 #if defined(ENABLE_DATA_REDUCTION_PROXY_DEBUGGING) |
68 scoped_ptr<data_reduction_proxy::ContentDataReductionProxyDebugUIService> | 69 scoped_ptr<data_reduction_proxy::ContentDataReductionProxyDebugUIService> |
69 data_reduction_proxy_ui_service( | 70 data_reduction_proxy_ui_service( |
70 new data_reduction_proxy::ContentDataReductionProxyDebugUIService( | 71 new data_reduction_proxy::ContentDataReductionProxyDebugUIService( |
71 base::Bind(&data_reduction_proxy::DataReductionProxyConfigurator:: | 72 base::Bind(&data_reduction_proxy::DataReductionProxyConfigurator:: |
72 GetProxyConfigOnIOThread, | 73 GetProxyConfigOnIOThread, |
73 base::Unretained( | 74 base::Unretained( |
74 data_reduction_proxy_io_data->configurator())), | 75 data_reduction_proxy_io_data->configurator())), |
75 ui_task_runner, io_task_runner)); | 76 ui_task_runner, io_task_runner, |
| 77 g_browser_process->GetApplicationLocale())); |
76 data_reduction_proxy_io_data->set_debug_ui_service( | 78 data_reduction_proxy_io_data->set_debug_ui_service( |
77 data_reduction_proxy_ui_service.Pass()); | 79 data_reduction_proxy_ui_service.Pass()); |
78 #endif | 80 #endif |
79 | 81 |
80 settings->SetDataReductionProxyStatisticsPrefs( | 82 settings->SetDataReductionProxyStatisticsPrefs( |
81 data_reduction_proxy_statistics_prefs); | 83 data_reduction_proxy_statistics_prefs); |
82 | 84 |
83 return data_reduction_proxy_io_data.Pass(); | 85 return data_reduction_proxy_io_data.Pass(); |
84 } | 86 } |
OLD | NEW |