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

Unified Diff: chrome/browser/media/permission_bubble_media_access_handler.cc

Issue 1318173002: Integrate MediaPermission with PermissionManager by using PermissionContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 | « chrome/browser/media/media_stream_devices_controller_browsertest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media/permission_bubble_media_access_handler.cc
diff --git a/chrome/browser/media/permission_bubble_media_access_handler.cc b/chrome/browser/media/permission_bubble_media_access_handler.cc
index df0579b9656f87744009f3fc7d43ffe5e4dd828e..76034ed9bd5e5929b7066192853ffe7a4f653a38 100644
--- a/chrome/browser/media/permission_bubble_media_access_handler.cc
+++ b/chrome/browser/media/permission_bubble_media_access_handler.cc
@@ -63,9 +63,9 @@ bool PermissionBubbleMediaAccessHandler::CheckMediaAccessPermission(
type == content::MEDIA_DEVICE_AUDIO_CAPTURE
? CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC
: CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA;
- MediaPermission permission(content_settings_type,
- content::MEDIA_DEVICE_ACCESS, security_origin,
- profile);
+ MediaPermission permission(
+ content_settings_type, content::MEDIA_DEVICE_ACCESS, security_origin,
+ web_contents->GetLastCommittedURL().GetOrigin(), profile);
content::MediaStreamRequestResult unused;
if (permission.GetPermissionStatus(&unused) == CONTENT_SETTING_ALLOW)
return true;
« no previous file with comments | « chrome/browser/media/media_stream_devices_controller_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698