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

Side by Side Diff: media/mojo/services/demuxer_stream_provider_shim.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/default_mojo_media_client.cc ('k') | media/mojo/services/media_apptest.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 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_DEMUXER_STREAM_PROVIDER_SHIM_H_ 5 #ifndef MEDIA_MOJO_SERVICES_DEMUXER_STREAM_PROVIDER_SHIM_H_
6 #define MEDIA_MOJO_SERVICES_DEMUXER_STREAM_PROVIDER_SHIM_H_ 6 #define MEDIA_MOJO_SERVICES_DEMUXER_STREAM_PROVIDER_SHIM_H_
7 7
8 #include <stddef.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/scoped_vector.h" 12 #include "base/memory/scoped_vector.h"
11 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
12 #include "media/base/demuxer_stream_provider.h" 14 #include "media/base/demuxer_stream_provider.h"
13 #include "media/mojo/services/mojo_demuxer_stream_adapter.h" 15 #include "media/mojo/services/mojo_demuxer_stream_adapter.h"
14 16
15 namespace media { 17 namespace media {
16 18
17 // DemuxerStreamProvider shim for interfaces::DemuxerStreams. 19 // DemuxerStreamProvider shim for interfaces::DemuxerStreams.
(...skipping 29 matching lines...) Expand all
47 49
48 // WeakPtrFactorys must always be the last member variable. 50 // WeakPtrFactorys must always be the last member variable.
49 base::WeakPtrFactory<DemuxerStreamProviderShim> weak_factory_; 51 base::WeakPtrFactory<DemuxerStreamProviderShim> weak_factory_;
50 52
51 DISALLOW_COPY_AND_ASSIGN(DemuxerStreamProviderShim); 53 DISALLOW_COPY_AND_ASSIGN(DemuxerStreamProviderShim);
52 }; 54 };
53 55
54 } // namespace media 56 } // namespace media
55 57
56 #endif // MEDIA_MOJO_SERVICES_DEMUXER_STREAM_PROVIDER_SHIM_H_ 58 #endif // MEDIA_MOJO_SERVICES_DEMUXER_STREAM_PROVIDER_SHIM_H_
OLDNEW
« no previous file with comments | « media/mojo/services/default_mojo_media_client.cc ('k') | media/mojo/services/media_apptest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698