media/base/android/browser_cdm_factory_android.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: media/base/android/browser_cdm_factory_android.h

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

Patch Set: Cleanup 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/cdm/browser_cdm_manager.cc ('k') | media/base/android/browser_cdm_factory_android.cc » ('j') | media/base/android/media_drm_bridge.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/base/android/browser_cdm_factory_android.h

diff --git a/media/base/android/browser_cdm_factory_android.h b/media/base/android/browser_cdm_factory_android.h

index 71b7970cfea79a88d036704a6415d0850038f38e..f01048d95412f919d6ff645c99f16f27886d7ad3 100644

--- a/media/base/android/browser_cdm_factory_android.h

+++ b/media/base/android/browser_cdm_factory_android.h

@@ -16,7 +16,7 @@ class MEDIA_EXPORT BrowserCdmFactoryAndroid : public BrowserCdmFactory {

BrowserCdmFactoryAndroid() {}

~BrowserCdmFactoryAndroid() final {};

- scoped_ptr<BrowserCdm> CreateBrowserCdm(

+ BrowserCdmPtr CreateBrowserCdm(

const std::string& key_system,

bool use_hw_secure_codecs,

const SessionMessageCB& session_message_cb,