media/base/cdm_callback_promise.h - Issue 1534273002: Switch to standard integer types in media/.

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 1534273002: Switch to standard integer types in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: more Created 5 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 8685c17a240e160d543de1424c36488ae70b8072..e4b5849aedad7a5cce3ac0a5a4847f68659b8745 100644

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

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

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

#include <string>

-#include "base/basictypes.h"

#include "base/callback.h"

#include "media/base/cdm_promise.h"

#include "media/base/media_export.h"

@@ -16,7 +15,7 @@

namespace media {

typedef base::Callback<void(MediaKeys::Exception exception_code,

- uint32 system_code,

+ uint32_t system_code,

const std::string& error_message)>

PromiseRejectedCB;

@@ -30,7 +29,7 @@ class MEDIA_EXPORT CdmCallbackPromise : public CdmPromiseTemplate<T...> {

// CdmPromiseTemplate<T> implementation.

virtual void resolve(const T&... result) override;

virtual void reject(MediaKeys::Exception exception_code,

- uint32 system_code,

+ uint32_t system_code,

const std::string& error_message) override;

private: