media/cdm/ppapi/external_clear_key/clear_key_cdm.h - Issue 2444683002: Move MediaKeys::Exception to CdmPromise::Exception

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/cdm/ppapi/external_clear_key/clear_key_cdm.h

Issue 2444683002: Move MediaKeys::Exception to CdmPromise::Exception (Closed)

Patch Set: include "media/base/media_keys.h" Created 4 years, 2 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: media/cdm/ppapi/external_clear_key/clear_key_cdm.h

diff --git a/media/cdm/ppapi/external_clear_key/clear_key_cdm.h b/media/cdm/ppapi/external_clear_key/clear_key_cdm.h

index 065ef9efdfe16b37c224e98c8c777b8fa38da8e8..26a0b7b3e002524830553af76661ba7f39336198 100644

--- a/media/cdm/ppapi/external_clear_key/clear_key_cdm.h

+++ b/media/cdm/ppapi/external_clear_key/clear_key_cdm.h

@@ -16,6 +16,7 @@

#include "base/memory/ref_counted.h"

#include "base/synchronization/lock.h"

#include "media/base/cdm_key_information.h"

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

#include "media/cdm/aes_decryptor.h"

#include "media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h"

@@ -106,7 +107,7 @@ class ClearKeyCdm : public ClearKeyCdmInterface {

void OnSessionLoaded(uint32_t promise_id, const std::string& session_id);

void OnPromiseResolved(uint32_t promise_id);

void OnPromiseFailed(uint32_t promise_id,

- MediaKeys::Exception exception_code,

+ CdmPromise::Exception exception_code,

uint32_t system_code,

const std::string& error_message);