media/base/cdm_promise_adapter.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_promise_adapter.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_promise_adapter.h

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

index b6d5a89be5be717dfd61760c98b21cc1c32a6745..0e7006d1c0c9fac96abbc7641ff3cd93948fbc3b 100644

--- a/media/base/cdm_promise_adapter.h

+++ b/media/base/cdm_promise_adapter.h

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

#ifndef MEDIA_BASE_CDM_PROMISE_ADAPTER_H_

#define MEDIA_BASE_CDM_PROMISE_ADAPTER_H_

-#include "base/basictypes.h"

#include "base/containers/scoped_ptr_hash_map.h"

#include "base/macros.h"

#include "base/memory/scoped_ptr.h"

@@ -35,7 +34,7 @@ class MEDIA_EXPORT CdmPromiseAdapter {

// |system_code| and |error_message|.

void RejectPromise(uint32_t promise_id,

MediaKeys::Exception exception_code,

- uint32 system_code,

+ uint32_t system_code,

const std::string& error_message);

// Rejects and clears all |promises_|.