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

Side by Side Diff: android_webview/browser/aw_browser_context.cc

Issue 412143009: Moved data reduction proxy initialization logic to ProfileImplIOData (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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 | « no previous file | chrome/browser/io_thread.h » ('j') | chrome/browser/io_thread.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 proxy_settings->SetDataReductionProxyEnabled(data_reduction_proxy_enabled_); 95 proxy_settings->SetDataReductionProxyEnabled(data_reduction_proxy_enabled_);
96 } 96 }
97 97
98 void AwBrowserContext::PreMainMessageLoopRun() { 98 void AwBrowserContext::PreMainMessageLoopRun() {
99 cookie_store_ = CreateCookieStore(this); 99 cookie_store_ = CreateCookieStore(this);
100 #if defined(SPDY_PROXY_AUTH_ORIGIN) 100 #if defined(SPDY_PROXY_AUTH_ORIGIN)
101 data_reduction_proxy_settings_.reset( 101 data_reduction_proxy_settings_.reset(
102 new DataReductionProxySettings( 102 new DataReductionProxySettings(
103 new data_reduction_proxy::DataReductionProxyParams( 103 new data_reduction_proxy::DataReductionProxyParams(
104 data_reduction_proxy::DataReductionProxyParams::kAllowed))); 104 data_reduction_proxy::DataReductionProxyParams::kAllowed)));
105 data_reduction_proxy_auth_request_handler_.reset( 105 data_reduction_proxy_auth_request_handler_.reset(
willchan no longer on Chromium 2014/07/29 00:26:56 Is this code running on the UI thread? It looks li
bengr 2014/07/29 21:29:52 I don't see one. Maybe Selim knows? On 2014/07/29
106 new DataReductionProxyAuthRequestHandler( 106 new DataReductionProxyAuthRequestHandler(
107 data_reduction_proxy_settings_->params())); 107 data_reduction_proxy_settings_->params(),
108 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
108 #endif 109 #endif
109 110
110 url_request_context_getter_ = 111 url_request_context_getter_ =
111 new AwURLRequestContextGetter(GetPath(), cookie_store_.get()); 112 new AwURLRequestContextGetter(GetPath(), cookie_store_.get());
112 113
113 if (data_reduction_proxy_settings_.get()) { 114 if (data_reduction_proxy_settings_.get()) {
114 scoped_ptr<data_reduction_proxy::DataReductionProxyConfigurator> 115 scoped_ptr<data_reduction_proxy::DataReductionProxyConfigurator>
115 configurator(new data_reduction_proxy::DataReductionProxyConfigTracker( 116 configurator(new data_reduction_proxy::DataReductionProxyConfigTracker(
116 url_request_context_getter_->proxy_config_service(), 117 url_request_context_getter_->proxy_config_service(),
117 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO))); 118 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 277
277 void AwBrowserContext::RebuildTable( 278 void AwBrowserContext::RebuildTable(
278 const scoped_refptr<URLEnumerator>& enumerator) { 279 const scoped_refptr<URLEnumerator>& enumerator) {
279 // Android WebView rebuilds from WebChromeClient.getVisitedHistory. The client 280 // Android WebView rebuilds from WebChromeClient.getVisitedHistory. The client
280 // can change in the lifetime of this WebView and may not yet be set here. 281 // can change in the lifetime of this WebView and may not yet be set here.
281 // Therefore this initialization path is not used. 282 // Therefore this initialization path is not used.
282 enumerator->OnComplete(true); 283 enumerator->OnComplete(true);
283 } 284 }
284 285
285 } // namespace android_webview 286 } // namespace android_webview
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/io_thread.h » ('j') | chrome/browser/io_thread.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698