content/browser/media/cdm/browser_cdm_manager.cc - Issue 1771743002: Move geolocation and permission mojoms into WebKit/public/platform.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/media/cdm/browser_cdm_manager.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: 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

« content/browser/geolocation/geolocation_service_context.h ('K') | « content/browser/media/cdm/browser_cdm_manager.h ('k') | content/browser/permissions/permission_service_context.h » ('j') | third_party/WebKit/public/platform/modules/permissions/permission.mojom » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/media/cdm/browser_cdm_manager.cc

diff --git a/content/browser/media/cdm/browser_cdm_manager.cc b/content/browser/media/cdm/browser_cdm_manager.cc

index db94775d626ff91874e1646bd675b03c546d4766..11f361d4b06c03c98ab004a4ad811a8c5391fb25 100644

--- a/content/browser/media/cdm/browser_cdm_manager.cc

+++ b/content/browser/media/cdm/browser_cdm_manager.cc

@@ -671,11 +671,12 @@ void BrowserCdmManager::CheckPermissionStatusOnUIThread(

return;

}

- PermissionStatus permission_status = permission_manager->GetPermissionStatus(

- PermissionType::PROTECTED_MEDIA_IDENTIFIER, security_origin,

- web_contents->GetLastCommittedURL().GetOrigin());

+ blink::mojom::PermissionStatus permission_status =

+ permission_manager->GetPermissionStatus(

+ PermissionType::PROTECTED_MEDIA_IDENTIFIER, security_origin,

+ web_contents->GetLastCommittedURL().GetOrigin());

- bool allowed = (permission_status == PermissionStatus::GRANTED);

+ bool allowed = (permission_status == blink::mojom::PermissionStatus::GRANTED);

if (!task_runner_->RunsTasksOnCurrentThread()) {

task_runner_->PostTask(FROM_HERE,

base::Bind(permission_status_cb, allowed));