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

Side by Side Diff: media/video/capture/android/video_capture_device_factory_android.h

Issue 893363002: Update {virtual,override,final} to follow C++11 style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 10 months 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/video/capture/android/video_capture_device_android.h ('k') | no next file » | 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_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/video/capture/video_capture_device_factory.h" 8 #include "media/video/capture/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 "media/video/capture/video_capture_device.h" 13 #include "media/video/capture/video_capture_device.h"
14 14
15 namespace media { 15 namespace media {
16 16
17 // VideoCaptureDeviceFactory on Android. This class implements the static 17 // VideoCaptureDeviceFactory on Android. This class implements the static
18 // VideoCapture methods and the factory of VideoCaptureAndroid. 18 // VideoCapture methods and the factory of VideoCaptureAndroid.
19 class MEDIA_EXPORT VideoCaptureDeviceFactoryAndroid : 19 class MEDIA_EXPORT VideoCaptureDeviceFactoryAndroid :
20 public VideoCaptureDeviceFactory { 20 public VideoCaptureDeviceFactory {
21 public: 21 public:
22 static bool RegisterVideoCaptureDeviceFactory(JNIEnv* env); 22 static bool RegisterVideoCaptureDeviceFactory(JNIEnv* env);
23 static base::android::ScopedJavaLocalRef<jobject> createVideoCaptureAndroid( 23 static base::android::ScopedJavaLocalRef<jobject> createVideoCaptureAndroid(
24 int id, 24 int id,
25 jlong nativeVideoCaptureDeviceAndroid); 25 jlong nativeVideoCaptureDeviceAndroid);
26 26
27 VideoCaptureDeviceFactoryAndroid() {} 27 VideoCaptureDeviceFactoryAndroid() {}
28 virtual ~VideoCaptureDeviceFactoryAndroid() {} 28 ~VideoCaptureDeviceFactoryAndroid() override {}
29 29
30 virtual scoped_ptr<VideoCaptureDevice> Create( 30 scoped_ptr<VideoCaptureDevice> Create(
31 const VideoCaptureDevice::Name& device_name) override; 31 const VideoCaptureDevice::Name& device_name) override;
32 virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names) override; 32 void GetDeviceNames(VideoCaptureDevice::Names* device_names) override;
33 virtual void GetDeviceSupportedFormats( 33 void GetDeviceSupportedFormats(
34 const VideoCaptureDevice::Name& device, 34 const VideoCaptureDevice::Name& device,
35 VideoCaptureFormats* supported_formats) override; 35 VideoCaptureFormats* supported_formats) override;
36 36
37 private: 37 private:
38 38
39 DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceFactoryAndroid);}; 39 DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceFactoryAndroid);};
40 } // namespace media 40 } // namespace media
41 41
42 #endif // MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_ 42 #endif // MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_
OLDNEW
« no previous file with comments | « media/video/capture/android/video_capture_device_android.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698