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

Side by Side Diff: media/capture/content/screen_capture_device_core.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/webmediasource_impl.h ('k') | media/capture/content/smooth_event_sampler.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_CAPTURE_SCREEN_CAPTURE_DEVICE_CORE_H_ 5 #ifndef MEDIA_CAPTURE_SCREEN_CAPTURE_DEVICE_CORE_H_
6 #define MEDIA_CAPTURE_SCREEN_CAPTURE_DEVICE_CORE_H_ 6 #define MEDIA_CAPTURE_SCREEN_CAPTURE_DEVICE_CORE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
11 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
12 #include "base/threading/thread_checker.h" 13 #include "base/threading/thread_checker.h"
13 #include "media/base/media_export.h" 14 #include "media/base/media_export.h"
14 #include "media/capture/content/thread_safe_capture_oracle.h" 15 #include "media/capture/content/thread_safe_capture_oracle.h"
15 #include "media/capture/video/video_capture_device.h" 16 #include "media/capture/video/video_capture_device.h"
16 17
17 namespace tracked_objects { 18 namespace tracked_objects {
18 class Location; 19 class Location;
19 } // namespace tracked_objects 20 } // namespace tracked_objects
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 // capture pipeline. Besides the VideoCaptureDevice itself, it is the only 100 // capture pipeline. Besides the VideoCaptureDevice itself, it is the only
100 // component of the system with direct access to |client_|. 101 // component of the system with direct access to |client_|.
101 scoped_refptr<ThreadSafeCaptureOracle> oracle_proxy_; 102 scoped_refptr<ThreadSafeCaptureOracle> oracle_proxy_;
102 103
103 DISALLOW_COPY_AND_ASSIGN(ScreenCaptureDeviceCore); 104 DISALLOW_COPY_AND_ASSIGN(ScreenCaptureDeviceCore);
104 }; 105 };
105 106
106 } // namespace media 107 } // namespace media
107 108
108 #endif // MEDIA_CAPTURE_SCREEN_CAPTURE_DEVICE_CORE_H_ 109 #endif // MEDIA_CAPTURE_SCREEN_CAPTURE_DEVICE_CORE_H_
OLDNEW
« no previous file with comments | « media/blink/webmediasource_impl.h ('k') | media/capture/content/smooth_event_sampler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698