Chromium Code Reviews

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

Issue 671243002: Fix the drp crash for real. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2171
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
« no previous file with comments | « no previous file | no next file » | no next file with comments »
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 200 matching lines...)
211 pref_service_factory.set_read_error_callback(base::Bind(&HandleReadError)); 211 pref_service_factory.set_read_error_callback(base::Bind(&HandleReadError));
212 user_pref_service_ = pref_service_factory.Create(pref_registry).Pass(); 212 user_pref_service_ = pref_service_factory.Create(pref_registry).Pass();
213 213
214 user_prefs::UserPrefs::Set(this, user_pref_service_.get()); 214 user_prefs::UserPrefs::Set(this, user_pref_service_.get());
215 215
216 if (data_reduction_proxy_settings_.get()) { 216 if (data_reduction_proxy_settings_.get()) {
217 data_reduction_proxy_settings_->InitDataReductionProxySettings( 217 data_reduction_proxy_settings_->InitDataReductionProxySettings(
218 user_pref_service_.get(), 218 user_pref_service_.get(),
219 GetRequestContext()); 219 GetRequestContext());
220 220
221 data_reduction_proxy_settings_->SetDataReductionProxyEnabled( 221 SetDataReductionProxyEnabled(data_reduction_proxy_enabled_);
222 data_reduction_proxy_enabled_);
223 } 222 }
224 } 223 }
225 224
226 base::FilePath AwBrowserContext::GetPath() const { 225 base::FilePath AwBrowserContext::GetPath() const {
227 return context_storage_path_; 226 return context_storage_path_;
228 } 227 }
229 228
230 bool AwBrowserContext::IsOffTheRecord() const { 229 bool AwBrowserContext::IsOffTheRecord() const {
231 // Android WebView does not support off the record profile yet. 230 // Android WebView does not support off the record profile yet.
232 return false; 231 return false;
(...skipping 75 matching lines...)
308 data_reduction_proxy_statistics_ = 307 data_reduction_proxy_statistics_ =
309 scoped_ptr<data_reduction_proxy::DataReductionProxyStatisticsPrefs>( 308 scoped_ptr<data_reduction_proxy::DataReductionProxyStatisticsPrefs>(
310 new data_reduction_proxy::DataReductionProxyStatisticsPrefs( 309 new data_reduction_proxy::DataReductionProxyStatisticsPrefs(
311 user_pref_service_.get(), 310 user_pref_service_.get(),
312 base::MessageLoopProxy::current(), 311 base::MessageLoopProxy::current(),
313 commit_delay)); 312 commit_delay));
314 } 313 }
315 } 314 }
316 315
317 } // namespace android_webview 316 } // namespace android_webview
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine