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

Side by Side Diff: media/mojo/services/demuxer_stream_provider_shim.h

Issue 1535193003: Add missing macros includes in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « media/midi/usb_midi_input_stream.h ('k') | media/mojo/services/mojo_demuxer_stream_adapter.h » ('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 "base/callback.h" 8 #include "base/callback.h"
9 #include "base/macros.h"
9 #include "base/memory/scoped_vector.h" 10 #include "base/memory/scoped_vector.h"
10 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
11 #include "media/base/demuxer_stream_provider.h" 12 #include "media/base/demuxer_stream_provider.h"
12 #include "media/mojo/services/mojo_demuxer_stream_adapter.h" 13 #include "media/mojo/services/mojo_demuxer_stream_adapter.h"
13 14
14 namespace media { 15 namespace media {
15 16
16 // DemuxerStreamProvider shim for interfaces::DemuxerStreams. 17 // DemuxerStreamProvider shim for interfaces::DemuxerStreams.
17 class DemuxerStreamProviderShim : public DemuxerStreamProvider { 18 class DemuxerStreamProviderShim : public DemuxerStreamProvider {
18 public: 19 public:
(...skipping 27 matching lines...) Expand all
46 47
47 // WeakPtrFactorys must always be the last member variable. 48 // WeakPtrFactorys must always be the last member variable.
48 base::WeakPtrFactory<DemuxerStreamProviderShim> weak_factory_; 49 base::WeakPtrFactory<DemuxerStreamProviderShim> weak_factory_;
49 50
50 DISALLOW_COPY_AND_ASSIGN(DemuxerStreamProviderShim); 51 DISALLOW_COPY_AND_ASSIGN(DemuxerStreamProviderShim);
51 }; 52 };
52 53
53 } // namespace media 54 } // namespace media
54 55
55 #endif // MEDIA_MOJO_SERVICES_DEMUXER_STREAM_PROVIDER_SHIM_H_ 56 #endif // MEDIA_MOJO_SERVICES_DEMUXER_STREAM_PROVIDER_SHIM_H_
OLDNEW
« no previous file with comments | « media/midi/usb_midi_input_stream.h ('k') | media/mojo/services/mojo_demuxer_stream_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698