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

Unified Diff: android_webview/browser/aw_resource_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/aw_resource_context.h ('k') | chrome/browser/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/browser/aw_resource_context.cc
diff --git a/android_webview/browser/aw_resource_context.cc b/android_webview/browser/aw_resource_context.cc
index 65682f54270345dfbb4516c055e382c89bec985f..523312fa699cade52665069c7f6bea6aa4fb85ee 100644
--- a/android_webview/browser/aw_resource_context.cc
+++ b/android_webview/browser/aw_resource_context.cc
@@ -3,17 +3,22 @@
// found in the LICENSE file.
#include "android_webview/browser/aw_resource_context.h"
-
+#include "components/media_device_id_salt/media_device_id_salt.h"
+#include "components/prefs/pref_service.h"
#include "content/public/browser/browser_thread.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_getter.h"
using content::BrowserThread;
+using media_device_id_salt::MediaDeviceIDSalt;
namespace android_webview {
-AwResourceContext::AwResourceContext(net::URLRequestContextGetter* getter)
- : getter_(getter) {
+AwResourceContext::AwResourceContext(net::URLRequestContextGetter* getter,
+ PrefService* pref_service,
+ bool incognito)
+ : getter_(getter),
+ media_device_id_salt_(new MediaDeviceIDSalt(pref_service, incognito)) {
DCHECK(getter_);
}
@@ -50,4 +55,9 @@ net::URLRequestContext* AwResourceContext::GetRequestContext() {
return getter_->GetURLRequestContext();
}
+content::ResourceContext::SaltCallback
+AwResourceContext::GetMediaDeviceIDSalt() {
+ return base::Bind(&MediaDeviceIDSalt::GetSalt, media_device_id_salt_);
+}
+
} // namespace android_webview
« no previous file with comments | « android_webview/browser/aw_resource_context.h ('k') | chrome/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698