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

Side by Side Diff: content/renderer/media/media_permission_dispatcher.cc

Issue 1943963004: Revert of (reland) Move permission.mojom from WebKit/public/platform/ to components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/media/media_permission_dispatcher.h" 5 #include "content/renderer/media/media_permission_dispatcher.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
10 #include "base/thread_task_runner_handle.h" 10 #include "base/thread_task_runner_handle.h"
11 #include "media/base/bind_to_current_loop.h" 11 #include "media/base/bind_to_current_loop.h"
12 #include "url/gurl.h" 12 #include "url/gurl.h"
13 13
14 namespace { 14 namespace {
15 15
16 using Type = media::MediaPermission::Type; 16 using Type = media::MediaPermission::Type;
17 17
18 permissions::mojom::PermissionName MediaPermissionTypeToPermissionName( 18 blink::mojom::PermissionName MediaPermissionTypeToPermissionName(Type type) {
19 Type type) {
20 switch (type) { 19 switch (type) {
21 case Type::PROTECTED_MEDIA_IDENTIFIER: 20 case Type::PROTECTED_MEDIA_IDENTIFIER:
22 return permissions::mojom::PermissionName::PROTECTED_MEDIA_IDENTIFIER; 21 return blink::mojom::PermissionName::PROTECTED_MEDIA_IDENTIFIER;
23 case Type::AUDIO_CAPTURE: 22 case Type::AUDIO_CAPTURE:
24 return permissions::mojom::PermissionName::AUDIO_CAPTURE; 23 return blink::mojom::PermissionName::AUDIO_CAPTURE;
25 case Type::VIDEO_CAPTURE: 24 case Type::VIDEO_CAPTURE:
26 return permissions::mojom::PermissionName::VIDEO_CAPTURE; 25 return blink::mojom::PermissionName::VIDEO_CAPTURE;
27 } 26 }
28 NOTREACHED(); 27 NOTREACHED();
29 return permissions::mojom::PermissionName::PROTECTED_MEDIA_IDENTIFIER; 28 return blink::mojom::PermissionName::PROTECTED_MEDIA_IDENTIFIER;
30 } 29 }
31 30
32 } // namespace 31 } // namespace
33 32
34 namespace content { 33 namespace content {
35 34
36 MediaPermissionDispatcher::MediaPermissionDispatcher( 35 MediaPermissionDispatcher::MediaPermissionDispatcher(
37 const ConnectToServiceCB& connect_to_service_cb) 36 const ConnectToServiceCB& connect_to_service_cb)
38 : connect_to_service_cb_(connect_to_service_cb), 37 : connect_to_service_cb_(connect_to_service_cb),
39 task_runner_(base::ThreadTaskRunnerHandle::Get()), 38 task_runner_(base::ThreadTaskRunnerHandle::Get()),
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 108
110 uint32_t request_id = next_request_id_++; 109 uint32_t request_id = next_request_id_++;
111 DCHECK(!requests_.count(request_id)); 110 DCHECK(!requests_.count(request_id));
112 requests_[request_id] = permission_status_cb; 111 requests_[request_id] = permission_status_cb;
113 112
114 return request_id; 113 return request_id;
115 } 114 }
116 115
117 void MediaPermissionDispatcher::OnPermissionStatus( 116 void MediaPermissionDispatcher::OnPermissionStatus(
118 uint32_t request_id, 117 uint32_t request_id,
119 permissions::mojom::PermissionStatus status) { 118 blink::mojom::PermissionStatus status) {
120 DVLOG(2) << __FUNCTION__ << ": (" << request_id << ", " << status << ")"; 119 DVLOG(2) << __FUNCTION__ << ": (" << request_id << ", " << status << ")";
121 DCHECK(task_runner_->RunsTasksOnCurrentThread()); 120 DCHECK(task_runner_->RunsTasksOnCurrentThread());
122 121
123 RequestMap::iterator iter = requests_.find(request_id); 122 RequestMap::iterator iter = requests_.find(request_id);
124 DCHECK(iter != requests_.end()) << "Request not found."; 123 DCHECK(iter != requests_.end()) << "Request not found.";
125 124
126 PermissionStatusCB permission_status_cb = iter->second; 125 PermissionStatusCB permission_status_cb = iter->second;
127 requests_.erase(iter); 126 requests_.erase(iter);
128 127
129 permission_status_cb.Run(status == 128 permission_status_cb.Run(status == blink::mojom::PermissionStatus::GRANTED);
130 permissions::mojom::PermissionStatus::GRANTED);
131 } 129 }
132 130
133 } // namespace content 131 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/media_permission_dispatcher.h ('k') | content/renderer/media/midi_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698