OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "android_webview/browser/aw_browser_context.h" | 5 #include "android_webview/browser/aw_browser_context.h" |
6 | 6 |
7 #include "android_webview/browser/aw_form_database_service.h" | 7 #include "android_webview/browser/aw_form_database_service.h" |
8 #include "android_webview/browser/aw_pref_store.h" | 8 #include "android_webview/browser/aw_pref_store.h" |
9 #include "android_webview/browser/aw_quota_manager_bridge.h" | 9 #include "android_webview/browser/aw_quota_manager_bridge.h" |
10 #include "android_webview/browser/aw_resource_context.h" | 10 #include "android_webview/browser/aw_resource_context.h" |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
153 LOG(WARNING) << "Failed to get cache directory for Android WebView. " | 153 LOG(WARNING) << "Failed to get cache directory for Android WebView. " |
154 << "Using app data directory as a fallback."; | 154 << "Using app data directory as a fallback."; |
155 } | 155 } |
156 url_request_context_getter_ = | 156 url_request_context_getter_ = |
157 new AwURLRequestContextGetter( | 157 new AwURLRequestContextGetter( |
158 cache_path, cookie_store_.get(), | 158 cache_path, cookie_store_.get(), |
159 make_scoped_ptr(CreateProxyConfigService()).Pass()); | 159 make_scoped_ptr(CreateProxyConfigService()).Pass()); |
160 | 160 |
161 data_reduction_proxy_settings_.reset( | 161 data_reduction_proxy_settings_.reset( |
162 new data_reduction_proxy::DataReductionProxySettings( | 162 new data_reduction_proxy::DataReductionProxySettings( |
163 new data_reduction_proxy::DataReductionProxyParams( | 163 scoped_ptr<data_reduction_proxy::DataReductionProxyParams>( |
164 data_reduction_proxy::DataReductionProxyParams::kAllowed))); | 164 new data_reduction_proxy::DataReductionProxyParams( |
| 165 data_reduction_proxy::DataReductionProxyParams::kAllowed)) |
| 166 .Pass())); |
165 data_reduction_proxy_io_data_.reset( | 167 data_reduction_proxy_io_data_.reset( |
166 new data_reduction_proxy::DataReductionProxyIOData( | 168 new data_reduction_proxy::DataReductionProxyIOData( |
167 data_reduction_proxy::Client::WEBVIEW_ANDROID, | 169 data_reduction_proxy::Client::WEBVIEW_ANDROID, |
168 scoped_ptr< | 170 scoped_ptr< |
169 data_reduction_proxy::DataReductionProxyStatisticsPrefs>(), | 171 data_reduction_proxy::DataReductionProxyStatisticsPrefs>(), |
170 data_reduction_proxy_settings_.get(), | 172 data_reduction_proxy_settings_.get(), |
171 url_request_context_getter_->GetNetLog(), | 173 url_request_context_getter_->GetNetLog(), |
172 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO), | 174 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO), |
173 BrowserThread::GetMessageLoopProxyForThread( | 175 BrowserThread::GetMessageLoopProxyForThread( |
174 BrowserThread::UI))); | 176 BrowserThread::UI))); |
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
376 DCHECK(GetDataReductionProxyIOData()); | 378 DCHECK(GetDataReductionProxyIOData()); |
377 if (GetDataReductionProxyIOData()->statistics_prefs()) | 379 if (GetDataReductionProxyIOData()->statistics_prefs()) |
378 return; | 380 return; |
379 // We don't care about commit_delay for now. It is just a dummy value. | 381 // We don't care about commit_delay for now. It is just a dummy value. |
380 base::TimeDelta commit_delay = base::TimeDelta::FromMinutes(60); | 382 base::TimeDelta commit_delay = base::TimeDelta::FromMinutes(60); |
381 GetDataReductionProxyIOData()->EnableCompressionStatisticsLogging( | 383 GetDataReductionProxyIOData()->EnableCompressionStatisticsLogging( |
382 user_pref_service_.get(), commit_delay); | 384 user_pref_service_.get(), commit_delay); |
383 } | 385 } |
384 | 386 |
385 } // namespace android_webview | 387 } // namespace android_webview |
OLD | NEW |