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

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

Issue 2759593002: Remove c/b/media/webrtc/media_permission.{h,cc} (Closed)
Patch Set: Remove c/b/media/webrtc/media_permission.{h,cc} 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 | « chrome/browser/media/webrtc/media_stream_devices_controller.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/webrtc/permission_bubble_media_access_handler.cc
diff --git a/chrome/browser/media/webrtc/permission_bubble_media_access_handler.cc b/chrome/browser/media/webrtc/permission_bubble_media_access_handler.cc
index 209f2c95e8e697ef9b94a6ee1a00805566a856e2..78e4f7fc7a0c50b1db2579f76b6fce9aee39e4d3 100644
--- a/chrome/browser/media/webrtc/permission_bubble_media_access_handler.cc
+++ b/chrome/browser/media/webrtc/permission_bubble_media_access_handler.cc
@@ -7,9 +7,10 @@
#include <utility>
#include "base/metrics/field_trial.h"
-#include "chrome/browser/media/webrtc/media_permission.h"
#include "chrome/browser/media/webrtc/media_stream_device_permissions.h"
#include "chrome/browser/media/webrtc/media_stream_devices_controller.h"
+#include "chrome/browser/permissions/permission_manager.h"
+#include "chrome/browser/permissions/permission_result.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/pref_names.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
@@ -82,11 +83,13 @@ bool PermissionBubbleMediaAccessHandler::CheckMediaAccessPermission(
? CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC
: CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA;
- MediaPermission permission(content_settings_type, security_origin,
- web_contents->GetLastCommittedURL().GetOrigin(),
- profile, web_contents);
- content::MediaStreamRequestResult unused;
- return permission.GetPermissionStatus(&unused) == CONTENT_SETTING_ALLOW;
+ DCHECK(!security_origin.is_empty());
+ GURL embedding_origin = web_contents->GetLastCommittedURL().GetOrigin();
+ PermissionManager* permission_manager = PermissionManager::Get(profile);
+ return permission_manager
+ ->GetPermissionStatus(content_settings_type, security_origin,
+ embedding_origin)
+ .content_setting == CONTENT_SETTING_ALLOW;
}
void PermissionBubbleMediaAccessHandler::HandleRequest(
« no previous file with comments | « chrome/browser/media/webrtc/media_stream_devices_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698