| Index: content/renderer/media/media_permission_dispatcher.h
|
| diff --git a/content/renderer/media/media_permission_dispatcher.h b/content/renderer/media/media_permission_dispatcher.h
|
| index 2a94defebcb133b2bd8170b376fec1fffa30d4f7..d63cdd3e84a058e37edeabab59a39d9531fafe9d 100644
|
| --- a/content/renderer/media/media_permission_dispatcher.h
|
| +++ b/content/renderer/media/media_permission_dispatcher.h
|
| @@ -13,9 +13,9 @@
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/weak_ptr.h"
|
| +#include "components/permissions/permission.mojom.h"
|
| #include "content/common/content_export.h"
|
| #include "media/base/media_permission.h"
|
| -#include "third_party/WebKit/public/platform/modules/permissions/permission.mojom.h"
|
|
|
| namespace base {
|
| class SingleThreadTaskRunner;
|
| @@ -27,7 +27,7 @@ namespace content {
|
| class CONTENT_EXPORT MediaPermissionDispatcher : public media::MediaPermission {
|
| public:
|
| using ConnectToServiceCB = base::Callback<void(
|
| - mojo::InterfaceRequest<blink::mojom::PermissionService>)>;
|
| + mojo::InterfaceRequest<permissions::mojom::PermissionService>)>;
|
|
|
| explicit MediaPermissionDispatcher(
|
| const ConnectToServiceCB& connect_to_service_cb);
|
| @@ -54,13 +54,13 @@ class CONTENT_EXPORT MediaPermissionDispatcher : public media::MediaPermission {
|
|
|
| // Callback for |permission_service_| calls.
|
| void OnPermissionStatus(uint32_t request_id,
|
| - blink::mojom::PermissionStatus status);
|
| + permissions::mojom::PermissionStatus status);
|
|
|
| ConnectToServiceCB connect_to_service_cb_;
|
| scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
|
| uint32_t next_request_id_;
|
| RequestMap requests_;
|
| - blink::mojom::PermissionServicePtr permission_service_;
|
| + permissions::mojom::PermissionServicePtr permission_service_;
|
|
|
| // Used to safely post MediaPermission calls for execution on |task_runner_|.
|
| base::WeakPtr<MediaPermissionDispatcher> weak_ptr_;
|
|
|