content/browser/media/android/media_drm_credential_manager.h - Issue 1341883003: Prepare MediaDrmBridge to work with MediaCodecPlayer

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/android/media_drm_credential_manager.h

Issue 1341883003: Prepare MediaDrmBridge to work with MediaCodecPlayer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bug526755

Patch Set: Partially addressed Xiaohan's comments Created 5 years, 3 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/media/android/browser_media_player_manager.cc ('k') | content/browser/media/android/media_drm_credential_manager.cc » ('j') | media/base/browser_cdm.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/media/android/media_drm_credential_manager.h

diff --git a/content/browser/media/android/media_drm_credential_manager.h b/content/browser/media/android/media_drm_credential_manager.h

index 56794e161694eb844ecb70e32b6c4195e9ec6c9d..7df6a80a190e6feeecb957e6543ac850b12817ab 100644

--- a/content/browser/media/android/media_drm_credential_manager.h

+++ b/content/browser/media/android/media_drm_credential_manager.h

@@ -52,7 +52,7 @@ class MediaDrmCredentialManager {

bool ResetCredentialsInternal(SecurityLevel security_level);

// The MediaDrmBridge object used to perform the credential reset.

- scoped_ptr<media::MediaDrmBridge> media_drm_bridge_;

+ media::BrowserCdmPtr media_drm_bridge_;

xhwang 2015/09/29 21:04:24 oops, I totally missed the point. I thought this i

Tima Vaisburd 2015/09/29 21:51:40 Done.

// The callback provided by the caller.

ResetCredentialsCB reset_credentials_cb_;