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

Side by Side Diff: media/blink/webmediasource_impl.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/blink/webmediaplayer_params.h ('k') | media/capture/content/screen_capture_device_core.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_WEBMEDIASOURCE_IMPL_H_ 5 #ifndef MEDIA_BLINK_WEBMEDIASOURCE_IMPL_H_
6 #define MEDIA_BLINK_WEBMEDIASOURCE_IMPL_H_ 6 #define MEDIA_BLINK_WEBMEDIASOURCE_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/macros.h"
11 #include "media/base/media_log.h" 12 #include "media/base/media_log.h"
12 #include "media/blink/media_blink_export.h" 13 #include "media/blink/media_blink_export.h"
13 #include "third_party/WebKit/public/platform/WebMediaSource.h" 14 #include "third_party/WebKit/public/platform/WebMediaSource.h"
14 15
15 namespace media { 16 namespace media {
16 class ChunkDemuxer; 17 class ChunkDemuxer;
17 18
18 class MEDIA_BLINK_EXPORT WebMediaSourceImpl 19 class MEDIA_BLINK_EXPORT WebMediaSourceImpl
19 : NON_EXPORTED_BASE(public blink::WebMediaSource) { 20 : NON_EXPORTED_BASE(public blink::WebMediaSource) {
20 public: 21 public:
(...skipping 14 matching lines...) Expand all
35 private: 36 private:
36 ChunkDemuxer* demuxer_; // Owned by WebMediaPlayerImpl. 37 ChunkDemuxer* demuxer_; // Owned by WebMediaPlayerImpl.
37 scoped_refptr<MediaLog> media_log_; 38 scoped_refptr<MediaLog> media_log_;
38 39
39 DISALLOW_COPY_AND_ASSIGN(WebMediaSourceImpl); 40 DISALLOW_COPY_AND_ASSIGN(WebMediaSourceImpl);
40 }; 41 };
41 42
42 } // namespace media 43 } // namespace media
43 44
44 #endif // MEDIA_BLINK_WEBMEDIASOURCE_IMPL_H_ 45 #endif // MEDIA_BLINK_WEBMEDIASOURCE_IMPL_H_
OLDNEW
« no previous file with comments | « media/blink/webmediaplayer_params.h ('k') | media/capture/content/screen_capture_device_core.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698