webkit/media/webmediaplayer_impl.h - Issue 15772012: Separate MediaKeys interface from Decryptor interface.

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: webkit/media/webmediaplayer_impl.h

Issue 15772012: Separate MediaKeys interface from Decryptor interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix android Created 7 years, 7 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: webkit/media/webmediaplayer_impl.h

diff --git a/webkit/media/webmediaplayer_impl.h b/webkit/media/webmediaplayer_impl.h

index 53cb42f8a00c6025ab154e273a18ea251fdc4883..85f8a49a3059274d1ade2e266d0c1c1ff46f98af 100644

--- a/webkit/media/webmediaplayer_impl.h

+++ b/webkit/media/webmediaplayer_impl.h

@@ -30,6 +30,7 @@

#include "googleurl/src/gurl.h"

#include "media/base/audio_renderer_sink.h"

#include "media/base/decryptor.h"

+#include "media/base/media_keys.h"

#include "media/base/pipeline.h"

#include "media/base/text_track.h"

#include "media/filters/gpu_video_decoder.h"

@@ -201,7 +202,7 @@ class WebMediaPlayerImpl

void OnKeyAdded(const std::string& key_system, const std::string& session_id);

void OnKeyError(const std::string& key_system,

const std::string& session_id,

- media::Decryptor::KeyError error_code,

+ media::MediaKeys::KeyError error_code,

int system_code);

void OnKeyMessage(const std::string& key_system,

const std::string& session_id,

« no previous file with comments | « webkit/media/crypto/proxy_decryptor.cc ('k') | webkit/media/webmediaplayer_impl.cc » ('j') | no next file with comments »