content/browser/media/cdm/browser_cdm_manager.cc - Issue 1837143002: media: Pass MediaPermission to MediaDrmBridge

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 1837143002: media: Pass MediaPermission to MediaDrmBridge Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: More plumbing 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:

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..f1ddbd19fec6e232383f19e0b66eff91ec8a738f 100644

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

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

@@ -297,8 +297,10 @@ media::CdmFactory* BrowserCdmManager::GetCdmFactory() {

GetBrowserContext())->GetURLRequestContext();

DCHECK(context_getter);

+ // Permission check is done in BrowserCdmManager so just pass in a null

+ // MediaPermission.

cdm_factory_.reset(new media::AndroidCdmFactory(

- base::Bind(&CreateProvisionFetcher, context_getter)));

+ nullptr, base::Bind(&CreateProvisionFetcher, context_getter)));

}

#endif

}