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

Side by Side Diff: media/capture/video/android/video_capture_device_factory_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 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_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_ 5 #ifndef MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_
6 #define MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_ 6 #define MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_
7 7
8 #include "media/capture/video/video_capture_device_factory.h" 8 #include "media/capture/video/video_capture_device_factory.h"
9 9
10 #include <jni.h> 10 #include <jni.h>
11 11
12 #include "base/android/scoped_java_ref.h" 12 #include "base/android/scoped_java_ref.h"
13 #include "base/macros.h"
13 #include "media/capture/video/video_capture_device.h" 14 #include "media/capture/video/video_capture_device.h"
14 15
15 namespace media { 16 namespace media {
16 17
17 // VideoCaptureDeviceFactory on Android. This class implements the static 18 // VideoCaptureDeviceFactory on Android. This class implements the static
18 // VideoCapture methods and the factory of VideoCaptureAndroid. 19 // VideoCapture methods and the factory of VideoCaptureAndroid.
19 class MEDIA_EXPORT VideoCaptureDeviceFactoryAndroid 20 class MEDIA_EXPORT VideoCaptureDeviceFactoryAndroid
20 : public VideoCaptureDeviceFactory { 21 : public VideoCaptureDeviceFactory {
21 public: 22 public:
22 static bool RegisterVideoCaptureDeviceFactory(JNIEnv* env); 23 static bool RegisterVideoCaptureDeviceFactory(JNIEnv* env);
(...skipping 10 matching lines...) Expand all
33 void GetDeviceSupportedFormats( 34 void GetDeviceSupportedFormats(
34 const VideoCaptureDevice::Name& device, 35 const VideoCaptureDevice::Name& device,
35 VideoCaptureFormats* supported_formats) override; 36 VideoCaptureFormats* supported_formats) override;
36 37
37 private: 38 private:
38 DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceFactoryAndroid); 39 DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceFactoryAndroid);
39 }; 40 };
40 } // namespace media 41 } // namespace media
41 42
42 #endif // MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_ 43 #endif // MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_
OLDNEW
« no previous file with comments | « media/capture/video/android/video_capture_device_android.h ('k') | media/capture/video/fake_video_capture_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698