content/browser/media/android/browser_media_player_manager.h - Issue 105383002: Rename EME WD call parameters

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/browser_media_player_manager.h

Issue 105383002: Rename EME WD call parameters (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 7 years 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 | « no previous file | content/browser/media/android/browser_media_player_manager.cc » ('j') | content/browser/media/android/browser_media_player_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index cee6be58ffb908517ae8de11cac6fc137458eba5..4f8cf85214ddb2fa3b74488f82a88d4116ed94ec 100644

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

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

@@ -91,16 +91,16 @@ class CONTENT_EXPORT BrowserMediaPlayerManager

virtual void DestroyAllMediaPlayers() OVERRIDE;

virtual void OnProtectedSurfaceRequested(int player_id) OVERRIDE;

virtual void OnSessionCreated(int media_keys_id,

- uint32 reference_id,

- const std::string& session_id) OVERRIDE;

+ uint32 session_id,

+ const std::string& web_session_id) OVERRIDE;

virtual void OnSessionMessage(int media_keys_id,

- uint32 reference_id,

+ uint32 session_id,

const std::vector<uint8>& message,

const std::string& destination_url) OVERRIDE;

- virtual void OnSessionReady(int media_keys_id, uint32 reference_id) OVERRIDE;

- virtual void OnSessionClosed(int media_keys_id, uint32 reference_id) OVERRIDE;

+ virtual void OnSessionReady(int media_keys_id, uint32 session_id) OVERRIDE;

+ virtual void OnSessionClosed(int media_keys_id, uint32 session_id) OVERRIDE;

virtual void OnSessionError(int media_keys_id,

- uint32 reference_id,

+ uint32 session_id,

media::MediaKeys::KeyError error_code,

int system_code) OVERRIDE;

@@ -136,14 +136,14 @@ class CONTENT_EXPORT BrowserMediaPlayerManager

const std::vector<uint8>& uuid,

const GURL& frame_url);

void OnGenerateKeyRequest(int media_keys_id,

- uint32 reference_id,

+ uint32 session_id,

const std::string& type,

const std::vector<uint8>& init_data);

void OnAddKey(int media_keys_id,

- uint32 reference_id,

+ uint32 session_id,

const std::vector<uint8>& key,

const std::vector<uint8>& init_data);

- void OnCancelKeyRequest(int media_keys_id, uint32 reference_id);

+ void OnCancelKeyRequest(int media_keys_id, uint32 session_id);

void OnSetMediaKeys(int player_id, int media_keys_id);

#if defined(GOOGLE_TV)

@@ -175,7 +175,7 @@ class CONTENT_EXPORT BrowserMediaPlayerManager

private:

void GenerateKeyIfAllowed(int media_keys_id,

- uint32 reference_id,

+ uint32 session_id,

const std::string& type,

const std::vector<uint8>& init_data,

bool allowed);