Add PermissionDescriptor to the permissions Mojo interface.

content/browser/permissions/permission_service_impl.cc

 // Copyright 2014 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 "content/browser/permissions/permission_service_impl.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/permission_manager.h"
 #include "content/public/browser/permission_type.h"
 
+using blink::mojom::PermissionDescriptorPtr;
 using blink::mojom::PermissionName;
 using blink::mojom::PermissionStatus;
 
 namespace content {
 
 namespace {
 
-PermissionType PermissionNameToPermissionType(PermissionName name) {
-  switch(name) {
+PermissionType PermissionDescriptorToPermissionType(
+    const PermissionDescriptorPtr& descriptor) {
+  switch (descriptor->name) {
     case PermissionName::GEOLOCATION:
       return PermissionType::GEOLOCATION;
     case PermissionName::NOTIFICATIONS:
       return PermissionType::NOTIFICATIONS;
     case PermissionName::PUSH_NOTIFICATIONS:
       return PermissionType::PUSH_MESSAGING;
-    case PermissionName::MIDI:
+    case PermissionName::MIDI: {
+      if (descriptor->extension && descriptor->extension->is_midi() &&
+          descriptor->extension->get_midi()->sysex) {
+        return PermissionType::MIDI_SYSEX;
+      }
       return PermissionType::MIDI;
-    case PermissionName::MIDI_SYSEX:
-      return PermissionType::MIDI_SYSEX;
+    }
     case PermissionName::PROTECTED_MEDIA_IDENTIFIER:
       return PermissionType::PROTECTED_MEDIA_IDENTIFIER;
     case PermissionName::DURABLE_STORAGE:
       return PermissionType::DURABLE_STORAGE;
     case PermissionName::AUDIO_CAPTURE:
       return PermissionType::AUDIO_CAPTURE;
     case PermissionName::VIDEO_CAPTURE:
       return PermissionType::VIDEO_CAPTURE;
     case PermissionName::BACKGROUND_SYNC:
       return PermissionType::BACKGROUND_SYNC;
@@ skipping 55 matching lines @@
   DCHECK(pending_requests_.IsEmpty());
 }
 
 void PermissionServiceImpl::OnConnectionError() {
   CancelPendingOperations();
   context_->ServiceHadConnectionError(this);
   // After that call, |this| will be deleted.
 }
 
 void PermissionServiceImpl::RequestPermission(
-    PermissionName permission,
+    PermissionDescriptorPtr permission,
     const url::Origin& origin,
     bool user_gesture,
     const PermissionStatusCallback& callback) {
   // This condition is valid if the call is coming from a ChildThread instead of
   // a RenderFrame. Some consumers of the service run in Workers and some in
   // Frames. In the context of a Worker, it is not possible to show a
   // permission prompt because there is no tab. In the context of a Frame, we
   // can. Even if the call comes from a context where it is not possible to show
   // any UI, we want to still return something relevant so the current
   // permission status is returned.
   BrowserContext* browser_context = context_->GetBrowserContext();
   DCHECK(browser_context);
   if (!context_->render_frame_host() ||
       !browser_context->GetPermissionManager()) {
-    callback.Run(GetPermissionStatusFromName(permission, origin));
+    callback.Run(GetPermissionStatus(permission, origin));
     return;
   }
 
   int pending_request_id = pending_requests_.Add(new PendingRequest(
       base::Bind(&PermissionRequestResponseCallbackWrapper, callback), 1));
   int id = browser_context->GetPermissionManager()->RequestPermission(
-      PermissionNameToPermissionType(permission), context_->render_frame_host(),
-      GURL(origin.Serialize()), user_gesture,
+      PermissionDescriptorToPermissionType(permission),
+      context_->render_frame_host(), GURL(origin.Serialize()), user_gesture,
       base::Bind(&PermissionServiceImpl::OnRequestPermissionResponse,
                  weak_factory_.GetWeakPtr(), pending_request_id));
 
   // Check if the request still exists. It might have been removed by the
   // callback if it was run synchronously.
   PendingRequest* pending_request = pending_requests_.Lookup(
       pending_request_id);
   if (!pending_request)
       return;
   pending_request->id = id;
 }
 
 void PermissionServiceImpl::OnRequestPermissionResponse(
     int pending_request_id,
     PermissionStatus status) {
   OnRequestPermissionsResponse(pending_request_id,
                                std::vector<PermissionStatus>(1, status));
 }
 
 void PermissionServiceImpl::RequestPermissions(
-    const std::vector<PermissionName>& permissions,
+    std::vector<PermissionDescriptorPtr> permissions,
     const url::Origin& origin,
     bool user_gesture,
     const RequestPermissionsCallback& callback) {
   // This condition is valid if the call is coming from a ChildThread instead of
   // a RenderFrame. Some consumers of the service run in Workers and some in
   // Frames. In the context of a Worker, it is not possible to show a
   // permission prompt because there is no tab. In the context of a Frame, we
   // can. Even if the call comes from a context where it is not possible to show
   // any UI, we want to still return something relevant so the current
   // permission status is returned for each permission.
   BrowserContext* browser_context = context_->GetBrowserContext();
   DCHECK(browser_context);
   if (!context_->render_frame_host() ||
       !browser_context->GetPermissionManager()) {
     std::vector<PermissionStatus> result(permissions.size());
-    for (size_t i = 0; i < permissions.size(); ++i) {
-      result[i] = GetPermissionStatusFromName(permissions[i], origin);
-    }
+    for (size_t i = 0; i < permissions.size(); ++i)
+      result[i] = GetPermissionStatus(permissions[i], origin);
     callback.Run(result);
     return;
   }
 
   std::vector<PermissionType> types(permissions.size());
   for (size_t i = 0; i < types.size(); ++i)
-    types[i] = PermissionNameToPermissionType(permissions[i]);
+    types[i] = PermissionDescriptorToPermissionType(permissions[i]);
 
   int pending_request_id = pending_requests_.Add(
       new PendingRequest(callback, permissions.size()));
   int id = browser_context->GetPermissionManager()->RequestPermissions(
       types, context_->render_frame_host(), GURL(origin.Serialize()),
       user_gesture,
       base::Bind(&PermissionServiceImpl::OnRequestPermissionsResponse,
                  weak_factory_.GetWeakPtr(), pending_request_id));
 
   // Check if the request still exists. It may have been removed by the
@@ skipping 37 matching lines @@
     it.GetCurrentValue()->callback.Run(GetPermissionStatusFromType(
         it.GetCurrentValue()->permission, it.GetCurrentValue()->origin));
     it.GetCurrentValue()->callback.Reset();
     permission_manager->UnsubscribePermissionStatusChange(
         it.GetCurrentValue()->id);
   }
   pending_subscriptions_.Clear();
 }
 
 void PermissionServiceImpl::HasPermission(
-    PermissionName permission,
+    PermissionDescriptorPtr permission,
     const url::Origin& origin,
     const PermissionStatusCallback& callback) {
-  callback.Run(GetPermissionStatusFromName(permission, origin));
+  callback.Run(GetPermissionStatus(permission, origin));
 }
 
 void PermissionServiceImpl::RevokePermission(
-    PermissionName permission,
+    PermissionDescriptorPtr permission,
     const url::Origin& origin,
     const PermissionStatusCallback& callback) {
-  PermissionType permission_type = PermissionNameToPermissionType(permission);
+  PermissionType permission_type =
+      PermissionDescriptorToPermissionType(permission);
   PermissionStatus status =
       GetPermissionStatusFromType(permission_type, origin);
 
   // Resetting the permission should only be possible if the permission is
   // already granted.
   if (status != PermissionStatus::GRANTED) {
     callback.Run(status);
     return;
   }
 
   ResetPermissionStatus(permission_type, origin);
 
   callback.Run(GetPermissionStatusFromType(permission_type, origin));
 }
 
 void PermissionServiceImpl::GetNextPermissionChange(
-    PermissionName permission,
+    PermissionDescriptorPtr permission,
     const url::Origin& origin,
     PermissionStatus last_known_status,
     const PermissionStatusCallback& callback) {
-  PermissionStatus current_status =
-      GetPermissionStatusFromName(permission, origin);
+  PermissionStatus current_status = GetPermissionStatus(permission, origin);
   if (current_status != last_known_status) {
     callback.Run(current_status);
     return;
   }
 
   BrowserContext* browser_context = context_->GetBrowserContext();
   DCHECK(browser_context);
   if (!browser_context->GetPermissionManager()) {
     callback.Run(current_status);
     return;
   }
 
-  PermissionType permission_type = PermissionNameToPermissionType(permission);
+  PermissionType permission_type =
+      PermissionDescriptorToPermissionType(permission);
 
   // We need to pass the id of PendingSubscription in pending_subscriptions_
   // to the callback but SubscribePermissionStatusChange() will also return an
   // id which is different.
   PendingSubscription* subscription =
       new PendingSubscription(permission_type, origin, callback);
   int pending_subscription_id = pending_subscriptions_.Add(subscription);
 
   GURL requesting_origin(origin.Serialize());
   GURL embedding_origin = context_->GetEmbeddingOrigin();
   subscription->id =
       browser_context->GetPermissionManager()->SubscribePermissionStatusChange(
           permission_type, requesting_origin,
           // If the embedding_origin is empty, we,ll use the |origin| instead.
           embedding_origin.is_empty() ? requesting_origin : embedding_origin,
           base::Bind(&PermissionServiceImpl::OnPermissionStatusChanged,
                      weak_factory_.GetWeakPtr(), pending_subscription_id));
 }
 
-PermissionStatus PermissionServiceImpl::GetPermissionStatusFromName(
-    PermissionName permission,
+PermissionStatus PermissionServiceImpl::GetPermissionStatus(
+    const PermissionDescriptorPtr& permission,
     const url::Origin& origin) {
-  return GetPermissionStatusFromType(PermissionNameToPermissionType(permission),
-                                     origin);
+  return GetPermissionStatusFromType(
+      PermissionDescriptorToPermissionType(permission), origin);
 }
 
 PermissionStatus PermissionServiceImpl::GetPermissionStatusFromType(
     PermissionType type,
     const url::Origin& origin) {
   BrowserContext* browser_context = context_->GetBrowserContext();
   DCHECK(browser_context);
   if (!browser_context->GetPermissionManager())
     return PermissionStatus::DENIED;
 
@@ skipping 35 matching lines @@
 
   PermissionStatusCallback callback = subscription->callback;
 
   subscription->callback.Reset();
   pending_subscriptions_.Remove(pending_subscription_id);
 
   callback.Run(status);
 }
 
 }  // namespace content