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

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

Issue 671823002: Fix the drp crash for real. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 2 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 | 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 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 pref_service_factory.set_read_error_callback(base::Bind(&HandleReadError)); 210 pref_service_factory.set_read_error_callback(base::Bind(&HandleReadError));
211 user_pref_service_ = pref_service_factory.Create(pref_registry).Pass(); 211 user_pref_service_ = pref_service_factory.Create(pref_registry).Pass();
212 212
213 user_prefs::UserPrefs::Set(this, user_pref_service_.get()); 213 user_prefs::UserPrefs::Set(this, user_pref_service_.get());
214 214
215 if (data_reduction_proxy_settings_.get()) { 215 if (data_reduction_proxy_settings_.get()) {
216 data_reduction_proxy_settings_->InitDataReductionProxySettings( 216 data_reduction_proxy_settings_->InitDataReductionProxySettings(
217 user_pref_service_.get(), 217 user_pref_service_.get(),
218 GetRequestContext()); 218 GetRequestContext());
219 219
220 data_reduction_proxy_settings_->SetDataReductionProxyEnabled( 220 SetDataReductionProxyEnabled(data_reduction_proxy_enabled_);
221 data_reduction_proxy_enabled_);
222 } 221 }
223 } 222 }
224 223
225 base::FilePath AwBrowserContext::GetPath() const { 224 base::FilePath AwBrowserContext::GetPath() const {
226 return context_storage_path_; 225 return context_storage_path_;
227 } 226 }
228 227
229 bool AwBrowserContext::IsOffTheRecord() const { 228 bool AwBrowserContext::IsOffTheRecord() const {
230 // Android WebView does not support off the record profile yet. 229 // Android WebView does not support off the record profile yet.
231 return false; 230 return false;
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 data_reduction_proxy_statistics_ = 306 data_reduction_proxy_statistics_ =
308 scoped_ptr<data_reduction_proxy::DataReductionProxyStatisticsPrefs>( 307 scoped_ptr<data_reduction_proxy::DataReductionProxyStatisticsPrefs>(
309 new data_reduction_proxy::DataReductionProxyStatisticsPrefs( 308 new data_reduction_proxy::DataReductionProxyStatisticsPrefs(
310 user_pref_service_.get(), 309 user_pref_service_.get(),
311 base::MessageLoopProxy::current(), 310 base::MessageLoopProxy::current(),
312 commit_delay)); 311 commit_delay));
313 } 312 }
314 } 313 }
315 314
316 } // namespace android_webview 315 } // 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
This is Rietveld 408576698