Add support for grouped AR/Camera permissions.

Enable grouping of the AR and Camera permission types in order to
present both permissions within a single prompt to the user. This prompt
will be displayed when a session is requested with camera access as a
requested feature.

UX Design Doc: https://docs.google.com/document/d/19iYmlZeyEIYwZFurDbYvwT0WEc1MfJ4TKS9V_JA2fF8/edit#heading=h.kffoh0tkafi0

Fixed: 1105590
Bug: 1106874
Change-Id: Ie6c1985f1dd717d3df88d0a856174ec1bdbc3b99
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2303376
Commit-Queue: Luis Garcia <luisggarcia@google.com>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Piotr Bialecki <bialpio@chromium.org>
Reviewed-by: Alexander Cooper <alcooper@chromium.org>
Reviewed-by: Klaus Weidner <klausw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#790518}

components/permissions/android/permission_prompt_android.cc

@@ -88,12 +88,11 @@ ContentSettingsType PermissionPromptAndroid::GetContentSettingType(
   return requests[position]->GetContentSettingsType();
 }
 
-// Grouped permission requests can only be Mic+Camera or Camera+Mic
-static void CheckValidRequestGroup(
+static bool IsValidMediaRequestGroup(
     const std::vector<permissions::PermissionRequest*>& requests) {
-  DCHECK_EQ(static_cast<size_t>(2), requests.size());
-  DCHECK_EQ(requests[0]->GetOrigin(), requests[1]->GetOrigin());
-  DCHECK(
+  if (requests.size() < 2)
+    return false;
+  return (
       (requests[0]->GetPermissionRequestType() ==
            permissions::PermissionRequestType::PERMISSION_MEDIASTREAM_MIC &&
        requests[1]->GetPermissionRequestType() ==
@@ -104,6 +103,31 @@ static void CheckValidRequestGroup(
            permissions::PermissionRequestType::PERMISSION_MEDIASTREAM_MIC));
 }
 
+static bool IsValidARCameraAccessRequestGroup(
+    const std::vector<permissions::PermissionRequest*>& requests) {
+  if (requests.size() < 2)
+    return false;
+  return (
+      (requests[0]->GetPermissionRequestType() ==
+           permissions::PermissionRequestType::PERMISSION_AR &&
+       requests[1]->GetPermissionRequestType() ==
+           permissions::PermissionRequestType::PERMISSION_MEDIASTREAM_CAMERA) ||
+      (requests[0]->GetPermissionRequestType() ==
+           permissions::PermissionRequestType::PERMISSION_MEDIASTREAM_CAMERA &&
+       requests[1]->GetPermissionRequestType() ==
+           permissions::PermissionRequestType::PERMISSION_AR));
+}
+
+// Grouped permission requests can only be Mic+Camera, Camera+Mic,
+// AR + Camera, or Camera + AR.
+static void CheckValidRequestGroup(
+    const std::vector<permissions::PermissionRequest*>& requests) {
+  DCHECK_EQ(static_cast<size_t>(2u), requests.size());
+  DCHECK_EQ(requests[0]->GetOrigin(), requests[1]->GetOrigin());
+  DCHECK((IsValidMediaRequestGroup(requests)) ||
+         (IsValidARCameraAccessRequestGroup(requests)));
+}
+
 int PermissionPromptAndroid::GetIconId() const {
   const std::vector<permissions::PermissionRequest*>& requests =
       delegate_->Requests();
@@ -119,11 +143,19 @@ base::string16 PermissionPromptAndroid::GetMessageText() const {
   if (requests.size() == 1)
     return requests[0]->GetMessageText();
   CheckValidRequestGroup(requests);
-  return l10n_util::GetStringFUTF16(
-      IDS_MEDIA_CAPTURE_AUDIO_AND_VIDEO_INFOBAR_TEXT,
-      url_formatter::FormatUrlForSecurityDisplay(
-          requests[0]->GetOrigin(),
-          url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC));
+  if (IsValidARCameraAccessRequestGroup(requests)) {
+    return l10n_util::GetStringFUTF16(
+        IDS_AR_AND_MEDIA_CAPTURE_VIDEO_INFOBAR_TEXT,
+        url_formatter::FormatUrlForSecurityDisplay(
+            requests[0]->GetOrigin(),
+            url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC));
+  } else {
+    return l10n_util::GetStringFUTF16(
+        IDS_MEDIA_CAPTURE_AUDIO_AND_VIDEO_INFOBAR_TEXT,
+        url_formatter::FormatUrlForSecurityDisplay(
+            requests[0]->GetOrigin(),
+            url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC));
+  }
 }
 
 void PermissionPromptAndroid::OnInfoBarRemoved(infobars::InfoBar* infobar,

components/permissions/permission_request_manager.cc

@@ -79,14 +79,28 @@ bool isMediaRequest(PermissionRequestType type) {
          type == PermissionRequestType::PERMISSION_CAMERA_PAN_TILT_ZOOM;
 }
 
-// We only group together media requests. We don't display grouped requests for
-// any other permissions at present.
+bool isArOrCameraRequest(PermissionRequestType type) {
+  return type == PermissionRequestType::PERMISSION_AR ||
+         type == PermissionRequestType::PERMISSION_MEDIASTREAM_CAMERA;
+}
+
 bool ShouldGroupRequests(PermissionRequest* a, PermissionRequest* b) {
   if (a->GetOrigin() != b->GetOrigin())
     return false;
 
-  return isMediaRequest(a->GetPermissionRequestType()) &&
-         isMediaRequest(b->GetPermissionRequestType());
+  // Group if both requests are media requests.
+  if (isMediaRequest(a->GetPermissionRequestType()) &&
+      isMediaRequest(b->GetPermissionRequestType())) {
+    return true;
+  }
+
+  // Group if the requests are an AR and a Camera Access request.
+  if (isArOrCameraRequest(a->GetPermissionRequestType()) &&
+      isArOrCameraRequest(b->GetPermissionRequestType())) {
+    return true;
+  }
+
+  return false;
 }
 
 }  // namespace

components/permissions_strings.grdp

@@ -24,6 +24,12 @@
     <message name="IDS_AR_INFOBAR_TEXT" desc="Text requesting permission for a site to use AR">
       <ph name="URL">$1<ex>google.com</ex></ph> wants to create a 3D map of your surroundings and track camera position
     </message>
+    <!-- TODO(https://bugs.chromium.org/p/chromium/issues/detail?id=1106874) -->
+    <message name="IDS_AR_AND_MEDIA_CAPTURE_VIDEO_INFOBAR_TEXT" desc="Text requesting permission for a site to use AR and the Camera Access Feature">
+      <ph name="URL">$1<ex>google.com</ex></ph> wants to:
+      • Create a 3D map of your surroundings and track camera position
+      • Use your camera
+    </message>
     <message name="IDS_NOTIFICATION_QUIET_PERMISSION_PROMPT_TITLE" desc="Text used as notification title when requesting permission for Web Notifications via a notification.">
       Notifications for <ph name="ORIGIN">$1<ex>example.com</ex></ph> are blocked
     </message>

components/permissions_strings_grdp/IDS_AR_AND_MEDIA_CAPTURE_VIDEO_INFOBAR_TEXT.png.sha1

+190759b575d8b4da48fc1bdec0a14e94a34c648e
\ No newline at end of file

content/browser/xr/service/vr_service_impl.cc

@@ -36,16 +36,29 @@ device::mojom::XRRuntimeSessionOptionsPtr GetRuntimeOptions(
   return runtime_options;
 }
 
-content::PermissionType GetRequiredPermission(
-    device::mojom::XRSessionMode mode) {
+std::vector<content::PermissionType> GetRequiredPermissions(
+    device::mojom::XRSessionMode mode,
+    const std::set<device::mojom::XRSessionFeature>& enabled_features) {
+  std::vector<content::PermissionType> permissions;
+
   switch (mode) {
     case device::mojom::XRSessionMode::kInline:
-      return content::PermissionType::SENSORS;
+      permissions.push_back(content::PermissionType::SENSORS);
+      break;
     case device::mojom::XRSessionMode::kImmersiveVr:
-      return content::PermissionType::VR;
+      permissions.push_back(content::PermissionType::VR);
+      break;
     case device::mojom::XRSessionMode::kImmersiveAr:
-      return content::PermissionType::AR;
+      permissions.push_back(content::PermissionType::AR);
+      break;
+  }
+
+  if (base::Contains(enabled_features,
+                     device::mojom::XRSessionFeature::CAMERA_ACCESS)) {
+    permissions.push_back(content::PermissionType::VIDEO_CAPTURE);
   }
+
+  return permissions;
 }
 
 }  // namespace
@@ -360,6 +373,7 @@ void VRServiceImpl::RequestSession(
   // features.
   std::set<device::mojom::XRSessionFeature> requested_features;
   for (const auto& feature : options->required_features) {
+    DVLOG(2) << __func__ << ": required_feature=" << feature;
     requested_features.insert(feature);
   }
 
@@ -394,22 +408,28 @@ void VRServiceImpl::GetPermissionStatus(SessionRequestData request,
           GetWebContents()->GetBrowserContext());
   DCHECK(permission_controller);
 
-  // Need to calculate the permission before the call below, as otherwise
-  // std::move nulls options out before GetRequiredPermission runs.
-  PermissionType permission = GetRequiredPermission(request.options->mode);
-  permission_controller->RequestPermission(
-      permission, render_frame_host_, render_frame_host_->GetLastCommittedURL(),
-      true,
-      base::BindOnce(&VRServiceImpl::OnPermissionResult,
+  // Need to calculate the permissions before the call below, as otherwise
+  // std::move nulls options out before GetRequiredPermissions runs.
+  const std::vector<PermissionType> permissions =
+      GetRequiredPermissions(request.options->mode, request.enabled_features);
+  permission_controller->RequestPermissions(
+      permissions, render_frame_host_,
+      render_frame_host_->GetLastCommittedURL(), true,
+      base::BindOnce(&VRServiceImpl::OnPermissionResults,
                      weak_ptr_factory_.GetWeakPtr(), std::move(request)));
 }
 
-void VRServiceImpl::OnPermissionResult(
+void VRServiceImpl::OnPermissionResults(
     SessionRequestData request,
-    blink::mojom::PermissionStatus permission_status) {
+    const std::vector<blink::mojom::PermissionStatus>& permission_statuses) {
   DVLOG(2) << __func__;
-  bool is_consent_granted =
-      (permission_status == blink::mojom::PermissionStatus::GRANTED);
+  bool is_consent_granted = true;
+  for (auto& permission_status : permission_statuses) {
+    if (permission_status != blink::mojom::PermissionStatus::GRANTED) {
+      is_consent_granted = false;
+      break;
+    }
+  }
 
   if (!is_consent_granted) {
     std::move(request.callback)

content/browser/xr/service/vr_service_impl.h

@@ -142,8 +142,9 @@ class CONTENT_EXPORT VRServiceImpl : public device::mojom::VRService,
   void GetPermissionStatus(SessionRequestData request,
                            BrowserXRRuntimeImpl* runtime);
 
-  void OnPermissionResult(SessionRequestData request,
-                          blink::mojom::PermissionStatus permission_status);
+  void OnPermissionResults(
+      SessionRequestData request,
+      const std::vector<blink::mojom::PermissionStatus>& permission_statuses);
 
   void EnsureRuntimeInstalled(SessionRequestData request,
                               BrowserXRRuntimeImpl* runtime);

weblayer/grit_strings_allowlist.txt

 IDS_ACCESSIBILITY_EVENTS_INFOBAR_TEXT
 IDS_ACCESSIBILITY_EVENTS_PERMISSION_FRAGMENT
+IDS_AR_AND_MEDIA_CAPTURE_VIDEO_INFOBAR_TEXT
 IDS_AR_INFOBAR_TEXT
 IDS_AR_PERMISSION_FRAGMENT
 IDS_BEFORERELOAD_APP_MESSAGEBOX_TITLE