content/browser/media/cdm/browser_cdm_manager.cc - Issue 1921553003: Move permission.mojom from WebKit/public/platform/ to components/

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 1921553003: 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, 8 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

« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.h ('k') | content/browser/notifications/notification_message_filter.h » ('j') | content/content_renderer.gypi » ('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 c50184af2487736dbc9d54c10ca253d1081ef84c..297d77a9b4ff20bd07aa6fd11df87884d5c6224b 100644

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

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

@@ -673,12 +673,13 @@ void BrowserCdmManager::CheckPermissionStatusOnUIThread(

return;

}

- blink::mojom::PermissionStatus permission_status =

+ permission::mojom::PermissionStatus permission_status =

permission_manager->GetPermissionStatus(

PermissionType::PROTECTED_MEDIA_IDENTIFIER, security_origin,

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

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

+ bool allowed =

+ (permission_status == permission::mojom::PermissionStatus::GRANTED);

if (!task_runner_->RunsTasksOnCurrentThread()) {

task_runner_->PostTask(FROM_HERE,

base::Bind(permission_status_cb, allowed));