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

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

Issue 2682863002: [Android] Explicitly request all needed runtime permissions. (Closed)
Patch Set: Rebase Created 3 years, 10 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
Index: chrome/browser/media/webrtc/media_stream_devices_controller.cc
diff --git a/chrome/browser/media/webrtc/media_stream_devices_controller.cc b/chrome/browser/media/webrtc/media_stream_devices_controller.cc
index 1a7f75ab7087195af4340adeeda997736111cad2..cccf4f82f0870a0966c96cb7e504e4458b430739 100644
--- a/chrome/browser/media/webrtc/media_stream_devices_controller.cc
+++ b/chrome/browser/media/webrtc/media_stream_devices_controller.cc
@@ -584,16 +584,15 @@ bool MediaStreamDevicesController::IsUserAcceptAllowed(
if (!window_android)
return false;
- std::string android_permission =
- PrefServiceBridge::GetAndroidPermissionForContentSetting(content_type);
- bool android_permission_blocked = false;
- if (!android_permission.empty()) {
- android_permission_blocked =
- !window_android->HasPermission(android_permission) &&
- !window_android->CanRequestPermission(android_permission);
+ std::vector<std::string> android_permissions;
+ PrefServiceBridge::GetAndroidPermissionsForContentSetting(
+ content_type, &android_permissions);
+ for (const auto& android_permission : android_permissions) {
+ if (!window_android->HasPermission(android_permission) &&
+ !window_android->CanRequestPermission(android_permission)) {
+ return false;
+ }
}
- if (android_permission_blocked)
- return false;
// Don't approve device requests if the tab was hidden.
// TODO(qinmin): Add a test for this. http://crbug.com/396869.

Powered by Google App Engine
This is Rietveld 408576698