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

Side by Side Diff: media/capture/video/android/video_capture_device_android.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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_ 5 #ifndef MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_
6 #define MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_ 6 #define MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <string> 9 #include <string>
10 10
11 #include "base/android/scoped_java_ref.h" 11 #include "base/android/scoped_java_ref.h"
12 #include "base/macros.h"
12 #include "base/synchronization/lock.h" 13 #include "base/synchronization/lock.h"
13 #include "base/threading/thread.h" 14 #include "base/threading/thread.h"
14 #include "base/time/time.h" 15 #include "base/time/time.h"
15 #include "media/base/media_export.h" 16 #include "media/base/media_export.h"
16 #include "media/capture/video/video_capture_device.h" 17 #include "media/capture/video/video_capture_device.h"
17 18
18 namespace tracked_objects { 19 namespace tracked_objects {
19 class Location; 20 class Location;
20 } // namespace tracked_ 21 } // namespace tracked_
21 22
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 94
94 // Java VideoCaptureAndroid instance. 95 // Java VideoCaptureAndroid instance.
95 base::android::ScopedJavaLocalRef<jobject> j_capture_; 96 base::android::ScopedJavaLocalRef<jobject> j_capture_;
96 97
97 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceAndroid); 98 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceAndroid);
98 }; 99 };
99 100
100 } // namespace media 101 } // namespace media
101 102
102 #endif // MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_ 103 #endif // MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_
OLDNEW
« no previous file with comments | « media/capture/content/smooth_event_sampler.h ('k') | media/capture/video/android/video_capture_device_factory_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698