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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
98 | 98 |
99 void AwBrowserContext::PreMainMessageLoopRun() { | 99 void AwBrowserContext::PreMainMessageLoopRun() { |
100 cookie_store_ = CreateCookieStore(this); | 100 cookie_store_ = CreateCookieStore(this); |
101 #if defined(SPDY_PROXY_AUTH_ORIGIN) | 101 #if defined(SPDY_PROXY_AUTH_ORIGIN) |
102 data_reduction_proxy_settings_.reset( | 102 data_reduction_proxy_settings_.reset( |
103 new DataReductionProxySettings( | 103 new DataReductionProxySettings( |
104 new data_reduction_proxy::DataReductionProxyParams( | 104 new data_reduction_proxy::DataReductionProxyParams( |
105 data_reduction_proxy::DataReductionProxyParams::kAllowed))); | 105 data_reduction_proxy::DataReductionProxyParams::kAllowed))); |
106 data_reduction_proxy_auth_request_handler_.reset( | 106 data_reduction_proxy_auth_request_handler_.reset( |
107 new DataReductionProxyAuthRequestHandler( | 107 new DataReductionProxyAuthRequestHandler( |
| 108 data_reduction_proxy::kClientAndroidWebview, |
| 109 data_reduction_proxy::kAndroidWebViewProtocolVersion, |
108 data_reduction_proxy_settings_->params())); | 110 data_reduction_proxy_settings_->params())); |
109 #endif | 111 #endif |
110 | 112 |
111 url_request_context_getter_ = | 113 url_request_context_getter_ = |
112 new AwURLRequestContextGetter(GetPath(), cookie_store_.get()); | 114 new AwURLRequestContextGetter(GetPath(), cookie_store_.get()); |
113 | 115 |
114 if (data_reduction_proxy_settings_.get()) { | 116 if (data_reduction_proxy_settings_.get()) { |
115 scoped_ptr<data_reduction_proxy::DataReductionProxyConfigurator> | 117 scoped_ptr<data_reduction_proxy::DataReductionProxyConfigurator> |
116 configurator(new data_reduction_proxy::DataReductionProxyConfigTracker( | 118 configurator(new data_reduction_proxy::DataReductionProxyConfigTracker( |
117 url_request_context_getter_->proxy_config_service(), | 119 url_request_context_getter_->proxy_config_service(), |
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
281 | 283 |
282 void AwBrowserContext::RebuildTable( | 284 void AwBrowserContext::RebuildTable( |
283 const scoped_refptr<URLEnumerator>& enumerator) { | 285 const scoped_refptr<URLEnumerator>& enumerator) { |
284 // Android WebView rebuilds from WebChromeClient.getVisitedHistory. The client | 286 // Android WebView rebuilds from WebChromeClient.getVisitedHistory. The client |
285 // can change in the lifetime of this WebView and may not yet be set here. | 287 // can change in the lifetime of this WebView and may not yet be set here. |
286 // Therefore this initialization path is not used. | 288 // Therefore this initialization path is not used. |
287 enumerator->OnComplete(true); | 289 enumerator->OnComplete(true); |
288 } | 290 } |
289 | 291 |
290 } // namespace android_webview | 292 } // namespace android_webview |
OLD | NEW |