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: Pass MediaCrypto as global ref pointer with MediaCryptoReady callback 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

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..1bb84284d1497cf3241462b8019926c2f338a87e 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_;

+ scoped_ptr<media::MediaDrmBridge, media::BrowserCdmDeleter> media_drm_bridge_;

// The callback provided by the caller.

ResetCredentialsCB reset_credentials_cb_;

« no previous file with comments | « no previous file | content/browser/media/cdm/browser_cdm_manager.h » ('j') | media/base/android/media_drm_bridge.cc » ('J')