Allow modal mic+camera permission prompts in PRM codepath

chrome/browser/permissions/permission_prompt_android.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/permissions/permission_prompt_android.h"
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/permissions/grouped_permission_infobar_delegate_android.h"
 #include "chrome/browser/permissions/permission_dialog_delegate.h"
@@ skipping 11 matching lines @@
   DCHECK(web_contents);
 }
 
 PermissionPromptAndroid::~PermissionPromptAndroid() {}
 
 void PermissionPromptAndroid::SetDelegate(Delegate* delegate) {
   delegate_ = delegate;
 }
 
 void PermissionPromptAndroid::Show() {
-  // Grouped permission requests are not yet supported in dialogs.
-  // TODO(timloh): Handle grouped media permissions (camera + microphone).
-  if (delegate_->Requests().size() == 1) {
-    bool has_gesture = delegate_->Requests()[0]->GetGestureType() ==
-                       PermissionRequestGestureType::GESTURE;
-    if (PermissionDialogDelegate::ShouldShowDialog(has_gesture)) {
-      PermissionDialogDelegate::Create(web_contents_, this);
-      return;
-    }
+  bool has_gesture = delegate_->Requests()[0]->GetGestureType() ==
+                     PermissionRequestGestureType::GESTURE;

[raymes, 2017/06/13 04:27:30]

Should this check all the requests? It looks a bit funny.

[Timothy Loh, 2017/06/14 04:56:43]

Done.

+  if (PermissionDialogDelegate::ShouldShowDialog(has_gesture)) {
+    PermissionDialogDelegate::Create(web_contents_, this);
+    return;
   }
 
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents_);
   if (!infobar_service)
     return;
 
   GroupedPermissionInfoBarDelegate::Create(
       this, infobar_service, delegate_->Requests()[0]->GetOrigin());
 }
@@ skipping 109 matching lines @@
     return GURL(chrome::kEnhancedPlaybackNotificationLearnMoreURL);
   }
   return GURL();
 }
 
 // static
 std::unique_ptr<PermissionPrompt> PermissionPrompt::Create(
     content::WebContents* web_contents) {
   return base::MakeUnique<PermissionPromptAndroid>(web_contents);
 }