media/base/cdm_callback_promise.h - Issue 2568463003: media: Rename MediaKeys to ContentDecryptionModule

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

Issue 2568463003: media: Rename MediaKeys to ContentDecryptionModule (Closed)

Patch Set: comments addressed Created 4 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:

Index: media/base/cdm_callback_promise.h

diff --git a/media/base/cdm_callback_promise.h b/media/base/cdm_callback_promise.h

index 834b943b228f736cdad01a170c6f636f4bcf3d1f..84f3db56d37f29b8df0e54256e31c8e881addd47 100644

--- a/media/base/cdm_callback_promise.h

+++ b/media/base/cdm_callback_promise.h

@@ -12,8 +12,9 @@

#include "base/callback.h"

#include "base/macros.h"

#include "media/base/cdm_promise.h"

+// TODO(xhwang): Remove this include after http://crbug.com/656706 is fixed.

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

#include "media/base/media_export.h"

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

namespace media {

« no previous file with comments | « media/base/android/media_player_android.cc ('k') | media/base/cdm_factory.h » ('j') | no next file with comments »