content/renderer/media/android/renderer_media_player_manager.h - Issue 185993004: Encrypted Media: Confine UUID code 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/renderer/media/android/renderer_media_player_manager.h

Issue 185993004: Encrypted Media: Confine UUID code to MediaDrmBridge. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: updated tests Created 6 years, 10 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/renderer/media/android/renderer_media_player_manager.h

diff --git a/content/renderer/media/android/renderer_media_player_manager.h b/content/renderer/media/android/renderer_media_player_manager.h

index 851da32ad327f7f4e733c6fe9247a08899263cc7..0c775f8f65e1f3df497482cae2906bcf9e241df3 100644

--- a/content/renderer/media/android/renderer_media_player_manager.h

+++ b/content/renderer/media/android/renderer_media_player_manager.h

@@ -91,7 +91,7 @@ class RendererMediaPlayerManager : public RenderViewObserver {

// Encrypted media related methods.

void InitializeCdm(int cdm_id,

ProxyMediaKeys* media_keys,

- const std::vector<uint8>& uuid,

+ const std::string& key_system,

const GURL& frame_url);

void CreateSession(int cdm_id,

uint32 session_id,