| 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 5396a45a92c5a2833414441d734d62ed57af4a26..d438757315873caa924b9e227cc3e0f143233598 100644
|
| --- a/content/renderer/media/media_permission_dispatcher.h
|
| +++ b/content/renderer/media/media_permission_dispatcher.h
|
| @@ -27,7 +27,7 @@ namespace content {
|
| class CONTENT_EXPORT MediaPermissionDispatcher : public media::MediaPermission {
|
| public:
|
| using ConnectToServiceCB =
|
| - base::Callback<void(mojo::InterfaceRequest<PermissionService>)>;
|
| + base::Callback<void(mojo::InterfaceRequest<mojom::PermissionService>)>;
|
|
|
| explicit MediaPermissionDispatcher(
|
| const ConnectToServiceCB& connect_to_service_cb);
|
| @@ -49,17 +49,17 @@ class CONTENT_EXPORT MediaPermissionDispatcher : public media::MediaPermission {
|
| typedef std::map<uint32_t, PermissionStatusCB> RequestMap;
|
|
|
| // Register PermissionStatusCBs. Returns |request_id| that can be used to make
|
| - // PermissionService calls.
|
| + // mojom::PermissionService calls.
|
| uint32_t RegisterCallback(const PermissionStatusCB& permission_status_cb);
|
|
|
| // Callback for |permission_service_| calls.
|
| - void OnPermissionStatus(uint32_t request_id, PermissionStatus status);
|
| + void OnPermissionStatus(uint32_t request_id, mojom::PermissionStatus status);
|
|
|
| ConnectToServiceCB connect_to_service_cb_;
|
| scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
|
| uint32_t next_request_id_;
|
| RequestMap requests_;
|
| - PermissionServicePtr permission_service_;
|
| + mojom::PermissionServicePtr permission_service_;
|
|
|
| // Used to safely post MediaPermission calls for execution on |task_runner_|.
|
| base::WeakPtr<MediaPermissionDispatcher> weak_ptr_;
|
|
|