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

Unified Diff: content/browser/permissions/permission_service_impl.cc

Issue 1771743002: Move geolocation and permission mojoms into WebKit/public/platform. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 9 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: content/browser/permissions/permission_service_impl.cc
diff --git a/content/browser/permissions/permission_service_impl.cc b/content/browser/permissions/permission_service_impl.cc
index 082ea12f7145d2c81ae42a4477fead52dcfc81ec..c7f92a8d9e92b7635f1b6b14bc81e028e9b756e0 100644
--- a/content/browser/permissions/permission_service_impl.cc
+++ b/content/browser/permissions/permission_service_impl.cc
@@ -12,31 +12,34 @@
#include "content/public/browser/permission_manager.h"
#include "content/public/browser/permission_type.h"
+using blink::mojom::PermissionName;
+using blink::mojom::PermissionStatus;
+
namespace content {
namespace {
-PermissionType PermissionNameToPermissionType(mojom::PermissionName name) {
+PermissionType PermissionNameToPermissionType(PermissionName name) {
switch(name) {
- case mojom::PermissionName::GEOLOCATION:
+ case PermissionName::GEOLOCATION:
return PermissionType::GEOLOCATION;
- case mojom::PermissionName::NOTIFICATIONS:
+ case PermissionName::NOTIFICATIONS:
return PermissionType::NOTIFICATIONS;
- case mojom::PermissionName::PUSH_NOTIFICATIONS:
+ case PermissionName::PUSH_NOTIFICATIONS:
return PermissionType::PUSH_MESSAGING;
- case mojom::PermissionName::MIDI:
+ case PermissionName::MIDI:
return PermissionType::MIDI;
- case mojom::PermissionName::MIDI_SYSEX:
+ case PermissionName::MIDI_SYSEX:
return PermissionType::MIDI_SYSEX;
- case mojom::PermissionName::PROTECTED_MEDIA_IDENTIFIER:
+ case PermissionName::PROTECTED_MEDIA_IDENTIFIER:
return PermissionType::PROTECTED_MEDIA_IDENTIFIER;
- case mojom::PermissionName::DURABLE_STORAGE:
+ case PermissionName::DURABLE_STORAGE:
return PermissionType::DURABLE_STORAGE;
- case mojom::PermissionName::AUDIO_CAPTURE:
+ case PermissionName::AUDIO_CAPTURE:
return PermissionType::AUDIO_CAPTURE;
- case mojom::PermissionName::VIDEO_CAPTURE:
+ case PermissionName::VIDEO_CAPTURE:
return PermissionType::VIDEO_CAPTURE;
- case mojom::PermissionName::BACKGROUND_SYNC:
+ case PermissionName::BACKGROUND_SYNC:
return PermissionType::BACKGROUND_SYNC;
}
@@ -47,8 +50,8 @@ PermissionType PermissionNameToPermissionType(mojom::PermissionName name) {
// This function allows the usage of the the multiple request map
// with single requests.
void PermissionRequestResponseCallbackWrapper(
- const mojo::Callback<void(mojom::PermissionStatus)>& callback,
- const mojo::Array<mojom::PermissionStatus>& vector) {
+ const mojo::Callback<void(PermissionStatus)>& callback,
+ const mojo::Array<PermissionStatus>& vector) {
DCHECK_EQ(vector.size(), 1ul);
callback.Run(vector[0]);
}
@@ -66,10 +69,10 @@ PermissionServiceImpl::PendingRequest::~PendingRequest() {
if (callback.is_null())
return;
- mojo::Array<mojom::PermissionStatus> result =
- mojo::Array<mojom::PermissionStatus>::New(request_count);
+ mojo::Array<PermissionStatus> result =
+ mojo::Array<PermissionStatus>::New(request_count);
for (int i = 0; i < request_count; ++i)
- result[i] = mojom::PermissionStatus::DENIED;
+ result[i] = PermissionStatus::DENIED;
callback.Run(std::move(result));
}
@@ -85,12 +88,12 @@ PermissionServiceImpl::PendingSubscription::PendingSubscription(
PermissionServiceImpl::PendingSubscription::~PendingSubscription() {
if (!callback.is_null())
- callback.Run(mojom::PermissionStatus::ASK);
+ callback.Run(PermissionStatus::ASK);
}
PermissionServiceImpl::PermissionServiceImpl(
PermissionServiceContext* context,
- mojo::InterfaceRequest<mojom::PermissionService> request)
+ mojo::InterfaceRequest<blink::mojom::PermissionService> request)
: context_(context),
binding_(this, std::move(request)),
weak_factory_(this) {
@@ -109,7 +112,7 @@ void PermissionServiceImpl::OnConnectionError() {
}
void PermissionServiceImpl::RequestPermission(
- mojom::PermissionName permission,
+ PermissionName permission,
const mojo::String& origin,
const PermissionStatusCallback& callback) {
// This condition is valid if the call is coming from a ChildThread instead of
@@ -148,17 +151,17 @@ void PermissionServiceImpl::RequestPermission(
void PermissionServiceImpl::OnRequestPermissionResponse(
int pending_request_id,
- mojom::PermissionStatus status) {
+ PermissionStatus status) {
OnRequestPermissionsResponse(pending_request_id,
- std::vector<mojom::PermissionStatus>(1, status));
+ std::vector<PermissionStatus>(1, status));
}
void PermissionServiceImpl::RequestPermissions(
- mojo::Array<mojom::PermissionName> permissions,
+ mojo::Array<PermissionName> permissions,
const mojo::String& origin,
const PermissionsStatusCallback& callback) {
if (permissions.is_null()) {
- callback.Run(mojo::Array<mojom::PermissionStatus>());
+ callback.Run(mojo::Array<PermissionStatus>());
return;
}
@@ -173,7 +176,7 @@ void PermissionServiceImpl::RequestPermissions(
DCHECK(browser_context);
if (!context_->render_frame_host() ||
!browser_context->GetPermissionManager()) {
- mojo::Array<mojom::PermissionStatus> result(permissions.size());
+ mojo::Array<PermissionStatus> result(permissions.size());
for (size_t i = 0; i < permissions.size(); ++i) {
result[i] =
GetPermissionStatusFromName(permissions[i], GURL(origin.get()));
@@ -207,12 +210,12 @@ void PermissionServiceImpl::RequestPermissions(
void PermissionServiceImpl::OnRequestPermissionsResponse(
int pending_request_id,
- const std::vector<mojom::PermissionStatus>& result) {
+ const std::vector<PermissionStatus>& result) {
PendingRequest* request = pending_requests_.Lookup(pending_request_id);
PermissionsStatusCallback callback(request->callback);
request->callback.reset();
pending_requests_.Remove(pending_request_id);
- callback.Run(mojo::Array<mojom::PermissionStatus>::From(result));
+ callback.Run(mojo::Array<PermissionStatus>::From(result));
}
void PermissionServiceImpl::CancelPendingOperations() {
@@ -244,24 +247,24 @@ void PermissionServiceImpl::CancelPendingOperations() {
}
void PermissionServiceImpl::HasPermission(
- mojom::PermissionName permission,
+ PermissionName permission,
const mojo::String& origin,
const PermissionStatusCallback& callback) {
callback.Run(GetPermissionStatusFromName(permission, GURL(origin.get())));
}
void PermissionServiceImpl::RevokePermission(
- mojom::PermissionName permission,
+ PermissionName permission,
const mojo::String& origin,
const PermissionStatusCallback& callback) {
GURL origin_url(origin.get());
PermissionType permission_type = PermissionNameToPermissionType(permission);
- mojom::PermissionStatus status =
+ PermissionStatus status =
GetPermissionStatusFromType(permission_type, origin_url);
// Resetting the permission should only be possible if the permission is
// already granted.
- if (status != mojom::PermissionStatus::GRANTED) {
+ if (status != PermissionStatus::GRANTED) {
callback.Run(status);
return;
}
@@ -272,12 +275,12 @@ void PermissionServiceImpl::RevokePermission(
}
void PermissionServiceImpl::GetNextPermissionChange(
- mojom::PermissionName permission,
+ PermissionName permission,
const mojo::String& mojo_origin,
- mojom::PermissionStatus last_known_status,
+ PermissionStatus last_known_status,
const PermissionStatusCallback& callback) {
GURL origin(mojo_origin.get());
- mojom::PermissionStatus current_status =
+ PermissionStatus current_status =
GetPermissionStatusFromName(permission, origin);
if (current_status != last_known_status) {
callback.Run(current_status);
@@ -312,20 +315,20 @@ void PermissionServiceImpl::GetNextPermissionChange(
pending_subscription_id));
}
-mojom::PermissionStatus PermissionServiceImpl::GetPermissionStatusFromName(
- mojom::PermissionName permission,
+PermissionStatus PermissionServiceImpl::GetPermissionStatusFromName(
+ PermissionName permission,
const GURL& origin) {
return GetPermissionStatusFromType(PermissionNameToPermissionType(permission),
origin);
}
-mojom::PermissionStatus PermissionServiceImpl::GetPermissionStatusFromType(
+PermissionStatus PermissionServiceImpl::GetPermissionStatusFromType(
PermissionType type,
const GURL& origin) {
BrowserContext* browser_context = context_->GetBrowserContext();
DCHECK(browser_context);
if (!browser_context->GetPermissionManager())
- return mojom::PermissionStatus::DENIED;
+ return PermissionStatus::DENIED;
// If the embedding_origin is empty we'll use |origin| instead.
GURL embedding_origin = context_->GetEmbeddingOrigin();
@@ -348,7 +351,7 @@ void PermissionServiceImpl::ResetPermissionStatus(PermissionType type,
void PermissionServiceImpl::OnPermissionStatusChanged(
int pending_subscription_id,
- mojom::PermissionStatus status) {
+ PermissionStatus status) {
PendingSubscription* subscription =
pending_subscriptions_.Lookup(pending_subscription_id);
« no previous file with comments | « content/browser/permissions/permission_service_impl.h ('k') | content/browser/push_messaging/push_messaging_message_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698