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

Unified Diff: extensions/browser/api/webcam_private/webcam_private_api_chromeos.cc

Issue 2820163002: Move MediaDeviceIDSalt from ProfileIOData to ProfileImpl. (Closed)
Patch Set: merge Created 3 years, 8 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 | « content/public/browser/resource_context.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/api/webcam_private/webcam_private_api_chromeos.cc
diff --git a/extensions/browser/api/webcam_private/webcam_private_api_chromeos.cc b/extensions/browser/api/webcam_private/webcam_private_api_chromeos.cc
index 7e768073e2f9e9f96cd4c9b6595f0a1f30e33b6b..05457ce265d6fc3d14bb7d33cf312b2abfefa4cd 100644
--- a/extensions/browser/api/webcam_private/webcam_private_api_chromeos.cc
+++ b/extensions/browser/api/webcam_private/webcam_private_api_chromeos.cc
@@ -120,9 +120,7 @@ bool WebcamPrivateAPI::GetDeviceId(const std::string& extension_id,
return content::GetMediaDeviceIDForHMAC(
content::MEDIA_DEVICE_VIDEO_CAPTURE,
- browser_context_->GetResourceContext()->GetMediaDeviceIDSalt(),
- security_origin,
- webcam_id,
+ browser_context_->GetMediaDeviceIDSalt(), security_origin, webcam_id,
device_id);
}
@@ -132,8 +130,7 @@ std::string WebcamPrivateAPI::GetWebcamId(const std::string& extension_id,
extensions::Extension::GetBaseURLFromExtensionId(extension_id));
return content::GetHMACForMediaDeviceID(
- browser_context_->GetResourceContext()->GetMediaDeviceIDSalt(),
- security_origin, device_id);
+ browser_context_->GetMediaDeviceIDSalt(), security_origin, device_id);
}
WebcamResource* WebcamPrivateAPI::FindWebcamResource(
« no previous file with comments | « content/public/browser/resource_context.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698