media/mojo/services/mojo_cdm_service.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/mojo/services/mojo_cdm_service.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 4 years, 12 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:

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_MOJO_SERVICES_MOJO_CDM_SERVICE_H_	5 #ifndef MEDIA_MOJO_SERVICES_MOJO_CDM_SERVICE_H_

6 #define MEDIA_MOJO_SERVICES_MOJO_CDM_SERVICE_H_	6 #define MEDIA_MOJO_SERVICES_MOJO_CDM_SERVICE_H_

7	7

	8 #include <stdint.h>

	9

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

9 #include "base/macros.h"	11 #include "base/macros.h"

10 #include "base/memory/ref_counted.h"	12 #include "base/memory/ref_counted.h"

11 #include "base/memory/scoped_ptr.h"	13 #include "base/memory/scoped_ptr.h"

12 #include "base/memory/weak_ptr.h"	14 #include "base/memory/weak_ptr.h"

13 #include "media/base/media_keys.h"	15 #include "media/base/media_keys.h"

14 #include "media/mojo/interfaces/content_decryption_module.mojom.h"	16 #include "media/mojo/interfaces/content_decryption_module.mojom.h"

15 #include "media/mojo/services/mojo_cdm_promise.h"	17 #include "media/mojo/services/mojo_cdm_promise.h"

16 #include "media/mojo/services/mojo_cdm_service_context.h"	18 #include "media/mojo/services/mojo_cdm_service_context.h"

17 #include "media/mojo/services/mojo_decryptor_service.h"	19 #include "media/mojo/services/mojo_decryptor_service.h"

(...skipping 110 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
128	130

129 base::WeakPtr<MojoCdmService> weak_this_;	131 base::WeakPtr<MojoCdmService> weak_this_;

130 base::WeakPtrFactory<MojoCdmService> weak_factory_;	132 base::WeakPtrFactory<MojoCdmService> weak_factory_;

131	133

132 DISALLOW_COPY_AND_ASSIGN(MojoCdmService);	134 DISALLOW_COPY_AND_ASSIGN(MojoCdmService);

133 };	135 };

134	136

135 } // namespace media	137 } // namespace media

136	138

137 #endif // MEDIA_MOJO_SERVICES_MOJO_CDM_SERVICE_H_	139 #endif // MEDIA_MOJO_SERVICES_MOJO_CDM_SERVICE_H_

OLD	NEW

« no previous file with comments | « media/mojo/services/mojo_cdm_promise.h ('k') | media/mojo/services/mojo_cdm_service.cc » ('j') | no next file with comments »