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

Unified Diff: android_webview/browser/aw_browser_context.cc

Issue 1981913002: *DRAFT* Move MediaDeviceIDSalt from chrome/ to components/ and use it in Android WebView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android_webview/browser/DEPS ('k') | android_webview/browser/aw_resource_context.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/browser/aw_browser_context.cc
diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc
index a66d83761a8ff890e51dadccbd14f18e7404bf3f..45f68e09419f33fdac2892ebb45aee3e9d81f066 100644
--- a/android_webview/browser/aw_browser_context.cc
+++ b/android_webview/browser/aw_browser_context.cc
@@ -26,6 +26,7 @@
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h"
#include "components/data_reduction_proxy/core/browser/data_store.h"
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
+#include "components/media_device_id_salt/media_device_id_salt.h"
#include "components/metrics/metrics_service.h"
#include "components/policy/core/browser/browser_policy_connector_base.h"
#include "components/policy/core/browser/configuration_policy_pref_store.h"
@@ -319,6 +320,7 @@ void AwBrowserContext::InitUserPrefService() {
pref_registry->RegisterStringPref(prefs::kAuthAndroidNegotiateAccountType,
std::string());
+ media_device_id_salt::MediaDeviceIDSalt::RegisterProfilePrefs(pref_registry);
metrics::MetricsService::RegisterPrefs(pref_registry);
PrefServiceFactory pref_service_factory;
@@ -353,7 +355,8 @@ bool AwBrowserContext::IsOffTheRecord() const {
content::ResourceContext* AwBrowserContext::GetResourceContext() {
if (!resource_context_) {
resource_context_.reset(
- new AwResourceContext(url_request_context_getter_.get()));
+ new AwResourceContext(url_request_context_getter_.get(),
+ user_pref_service_.get(), IsOffTheRecord()));
}
return resource_context_.get();
}
« no previous file with comments | « android_webview/browser/DEPS ('k') | android_webview/browser/aw_resource_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698