media/blink/cdm_result_promise.h - Issue 1542013004: Switch to standard integer types in media/, take 2.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: media/blink/cdm_result_promise.h

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: more stddef 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:

View unified diff | Download patch

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef MEDIA_BLINK_CDM_RESULT_PROMISE_H_	5 #ifndef MEDIA_BLINK_CDM_RESULT_PROMISE_H_

6 #define MEDIA_BLINK_CDM_RESULT_PROMISE_H_	6 #define MEDIA_BLINK_CDM_RESULT_PROMISE_H_

7	7

	8 #include <stdint.h>

	9

8 #include "base/macros.h"	10 #include "base/macros.h"

9 #include "media/base/cdm_promise.h"	11 #include "media/base/cdm_promise.h"

10 #include "media/base/media_keys.h"	12 #include "media/base/media_keys.h"

11 #include "media/blink/cdm_result_promise_helper.h"	13 #include "media/blink/cdm_result_promise_helper.h"

12 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h"	14 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h"

13 #include "third_party/WebKit/public/platform/WebString.h"	15 #include "third_party/WebKit/public/platform/WebString.h"

14	16

15 namespace media {	17 namespace media {

16	18

17 // Used to convert a WebContentDecryptionModuleResult into a CdmPromiseTemplate	19 // Used to convert a WebContentDecryptionModuleResult into a CdmPromiseTemplate

(...skipping 55 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
73 ReportCdmResultUMA(uma_name_,	75 ReportCdmResultUMA(uma_name_,

74 ConvertCdmExceptionToResultForUMA(exception_code));	76 ConvertCdmExceptionToResultForUMA(exception_code));

75 web_cdm_result_.completeWithError(ConvertCdmException(exception_code),	77 web_cdm_result_.completeWithError(ConvertCdmException(exception_code),

76 system_code,	78 system_code,

77 blink::WebString::fromUTF8(error_message));	79 blink::WebString::fromUTF8(error_message));

78 }	80 }

79	81

80 } // namespace media	82 } // namespace media

81	83

82 #endif // MEDIA_BLINK_CDM_RESULT_PROMISE_H_	84 #endif // MEDIA_BLINK_CDM_RESULT_PROMISE_H_

OLD	NEW

« no previous file with comments | « media/blink/cache_util_unittest.cc ('k') | media/blink/cdm_session_adapter.h » ('j') | no next file with comments »