Index: content/browser/permissions/permission_service_impl.h |
diff --git a/content/browser/permissions/permission_service_impl.h b/content/browser/permissions/permission_service_impl.h |
index 26321870d3d7bcd6d210410a76496d5245f4742a..5f89ba8e9f444a8f660045503c5ce392febcab06 100644 |
--- a/content/browser/permissions/permission_service_impl.h |
+++ b/content/browser/permissions/permission_service_impl.h |
@@ -8,8 +8,8 @@ |
#include "base/id_map.h" |
#include "base/macros.h" |
#include "base/memory/weak_ptr.h" |
+#include "components/permission/public/interfaces/permission.mojom.h" |
#include "content/browser/permissions/permission_service_context.h" |
-#include "content/common/permission_service.mojom.h" |
#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" |
namespace content { |
@@ -23,7 +23,7 @@ enum class PermissionType; |
// to have some information about the current context. That enables the service |
// to know whether it can show UI and have knowledge of the associated |
// WebContents for example. |
-class PermissionServiceImpl : public PermissionService { |
+class PermissionServiceImpl : public permission::PermissionService { |
public: |
~PermissionServiceImpl() override; |
@@ -35,13 +35,14 @@ class PermissionServiceImpl : public PermissionService { |
protected: |
friend PermissionServiceContext; |
- PermissionServiceImpl(PermissionServiceContext* context, |
- mojo::InterfaceRequest<PermissionService> request); |
+ PermissionServiceImpl( |
+ PermissionServiceContext* context, |
+ mojo::InterfaceRequest<permission::PermissionService> request); |
private: |
- using PermissionStatusCallback = mojo::Callback<void(PermissionStatus)>; |
+ using PermissionStatusCallback = mojo::Callback<void(permission::Status)>; |
using PermissionsStatusCallback = |
- mojo::Callback<void(mojo::Array<PermissionStatus>)>; |
+ mojo::Callback<void(mojo::Array<permission::Status>)>; |
struct PendingRequest { |
PendingRequest(PermissionType permission, const GURL& origin, |
@@ -69,45 +70,45 @@ class PermissionServiceImpl : public PermissionService { |
}; |
using SubscriptionsMap = IDMap<PendingSubscription, IDMapOwnPointer>; |
- // PermissionService. |
- void HasPermission(PermissionName permission, |
+ // permission::PermissionService. |
+ void HasPermission(permission::Name permission, |
const mojo::String& origin, |
const PermissionStatusCallback& callback) override; |
- void RequestPermission(PermissionName permission, |
+ void RequestPermission(permission::Name permission, |
const mojo::String& origin, |
bool user_gesture, |
const PermissionStatusCallback& callback) override; |
- void RequestPermissions(mojo::Array<PermissionName> permissions, |
+ void RequestPermissions(mojo::Array<permission::Name> permissions, |
const mojo::String& origin, |
bool user_gesture, |
const PermissionsStatusCallback& callback) override; |
- void RevokePermission(PermissionName permission, |
+ void RevokePermission(permission::Name permission, |
const mojo::String& origin, |
const PermissionStatusCallback& callback) override; |
void GetNextPermissionChange( |
- PermissionName permission, |
+ permission::Name permission, |
const mojo::String& origin, |
- PermissionStatus last_known_status, |
+ permission::Status last_known_status, |
const PermissionStatusCallback& callback) override; |
void OnConnectionError(); |
- void OnRequestPermissionResponse(int request_id, PermissionStatus status); |
+ void OnRequestPermissionResponse(int request_id, permission::Status status); |
- PermissionStatus GetPermissionStatusFromName(PermissionName permission, |
- const GURL& origin); |
- PermissionStatus GetPermissionStatusFromType(PermissionType type, |
- const GURL& origin); |
+ permission::Status GetPermissionStatusFromName(permission::Name permission, |
+ const GURL& origin); |
+ permission::Status GetPermissionStatusFromType(PermissionType type, |
+ const GURL& origin); |
void ResetPermissionStatus(PermissionType type, const GURL& origin); |
void OnPermissionStatusChanged(int pending_subscription_id, |
- PermissionStatus status); |
+ permission::Status status); |
RequestsMap pending_requests_; |
SubscriptionsMap pending_subscriptions_; |
// context_ owns |this|. |
PermissionServiceContext* context_; |
- mojo::Binding<PermissionService> binding_; |
+ mojo::Binding<permission::PermissionService> binding_; |
base::WeakPtrFactory<PermissionServiceImpl> weak_factory_; |
DISALLOW_COPY_AND_ASSIGN(PermissionServiceImpl); |