| 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 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 } | 134 } |
| 135 | 135 |
| 136 void AwBrowserContext::PreMainMessageLoopRun() { | 136 void AwBrowserContext::PreMainMessageLoopRun() { |
| 137 cookie_store_ = CreateCookieStore(this); | 137 cookie_store_ = CreateCookieStore(this); |
| 138 data_reduction_proxy_settings_.reset( | 138 data_reduction_proxy_settings_.reset( |
| 139 new DataReductionProxySettings( | 139 new DataReductionProxySettings( |
| 140 new data_reduction_proxy::DataReductionProxyParams( | 140 new data_reduction_proxy::DataReductionProxyParams( |
| 141 data_reduction_proxy::DataReductionProxyParams::kAllowed))); | 141 data_reduction_proxy::DataReductionProxyParams::kAllowed))); |
| 142 data_reduction_proxy_event_store_.reset( | 142 data_reduction_proxy_event_store_.reset( |
| 143 new DataReductionProxyEventStore( | 143 new DataReductionProxyEventStore( |
| 144 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO))); | 144 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI))); |
| 145 scoped_ptr<DataReductionProxyConfigService> | 145 scoped_ptr<DataReductionProxyConfigService> |
| 146 data_reduction_proxy_config_service( | 146 data_reduction_proxy_config_service( |
| 147 new DataReductionProxyConfigService( | 147 new DataReductionProxyConfigService( |
| 148 scoped_ptr<net::ProxyConfigService>( | 148 scoped_ptr<net::ProxyConfigService>( |
| 149 CreateProxyConfigService()).Pass())); | 149 CreateProxyConfigService()).Pass())); |
| 150 if (data_reduction_proxy_settings_.get()) { | 150 if (data_reduction_proxy_settings_.get()) { |
| 151 data_reduction_proxy_configurator_.reset( | 151 data_reduction_proxy_configurator_.reset( |
| 152 new data_reduction_proxy::DataReductionProxyConfigTracker( | 152 new data_reduction_proxy::DataReductionProxyConfigTracker( |
| 153 base::Bind(&DataReductionProxyConfigService::UpdateProxyConfig, | 153 base::Bind(&DataReductionProxyConfigService::UpdateProxyConfig, |
| 154 base::Unretained( | 154 base::Unretained( |
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 367 data_reduction_proxy_statistics_ = | 367 data_reduction_proxy_statistics_ = |
| 368 scoped_ptr<data_reduction_proxy::DataReductionProxyStatisticsPrefs>( | 368 scoped_ptr<data_reduction_proxy::DataReductionProxyStatisticsPrefs>( |
| 369 new data_reduction_proxy::DataReductionProxyStatisticsPrefs( | 369 new data_reduction_proxy::DataReductionProxyStatisticsPrefs( |
| 370 user_pref_service_.get(), | 370 user_pref_service_.get(), |
| 371 base::MessageLoopProxy::current(), | 371 base::MessageLoopProxy::current(), |
| 372 commit_delay)); | 372 commit_delay)); |
| 373 } | 373 } |
| 374 } | 374 } |
| 375 | 375 |
| 376 } // namespace android_webview | 376 } // namespace android_webview |
| OLD | NEW |