Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(704)

Side by Side Diff: media/mojo/services/mojo_cdm_service_context.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
« no previous file with comments | « media/mojo/services/mojo_cdm_service.cc ('k') | media/mojo/services/mojo_decryptor.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_CONTEXT_H_ 5 #ifndef MEDIA_MOJO_SERVICES_MOJO_CDM_SERVICE_CONTEXT_H_
6 #define MEDIA_MOJO_SERVICES_MOJO_CDM_SERVICE_CONTEXT_H_ 6 #define MEDIA_MOJO_SERVICES_MOJO_CDM_SERVICE_CONTEXT_H_
7 7
8 #include <stdint.h>
9
8 #include <map> 10 #include <map>
9 11
10 #include "base/macros.h" 12 #include "base/macros.h"
11 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
12 #include "media/base/cdm_context.h" 14 #include "media/base/cdm_context.h"
13 #include "media/base/media_export.h" 15 #include "media/base/media_export.h"
14 16
15 namespace media { 17 namespace media {
16 18
17 class MojoCdmService; 19 class MojoCdmService;
(...skipping 25 matching lines...) Expand all
43 45
44 // NOTE: Weak pointers must be invalidated before all other member variables. 46 // NOTE: Weak pointers must be invalidated before all other member variables.
45 base::WeakPtrFactory<MojoCdmServiceContext> weak_ptr_factory_; 47 base::WeakPtrFactory<MojoCdmServiceContext> weak_ptr_factory_;
46 48
47 DISALLOW_COPY_AND_ASSIGN(MojoCdmServiceContext); 49 DISALLOW_COPY_AND_ASSIGN(MojoCdmServiceContext);
48 }; 50 };
49 51
50 } // namespace media 52 } // namespace media
51 53
52 #endif // MEDIA_MOJO_SERVICES_MOJO_CDM_SERVICE_CONTEXT_H_ 54 #endif // MEDIA_MOJO_SERVICES_MOJO_CDM_SERVICE_CONTEXT_H_
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_cdm_service.cc ('k') | media/mojo/services/mojo_decryptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698