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

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

Issue 623263003: replace OVERRIDE and FINAL with override and final in media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
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>
(...skipping 16 matching lines...) Expand all
27 }; 27 };
28 static bool RegisterVideoCaptureDeviceFactory(JNIEnv* env); 28 static bool RegisterVideoCaptureDeviceFactory(JNIEnv* env);
29 static base::android::ScopedJavaLocalRef<jobject> createVideoCaptureAndroid( 29 static base::android::ScopedJavaLocalRef<jobject> createVideoCaptureAndroid(
30 int id, 30 int id,
31 jlong nativeVideoCaptureDeviceAndroid); 31 jlong nativeVideoCaptureDeviceAndroid);
32 32
33 VideoCaptureDeviceFactoryAndroid() {} 33 VideoCaptureDeviceFactoryAndroid() {}
34 virtual ~VideoCaptureDeviceFactoryAndroid() {} 34 virtual ~VideoCaptureDeviceFactoryAndroid() {}
35 35
36 virtual scoped_ptr<VideoCaptureDevice> Create( 36 virtual scoped_ptr<VideoCaptureDevice> Create(
37 const VideoCaptureDevice::Name& device_name) OVERRIDE; 37 const VideoCaptureDevice::Name& device_name) override;
38 virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names) OVERRIDE; 38 virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names) override;
39 virtual void GetDeviceSupportedFormats( 39 virtual void GetDeviceSupportedFormats(
40 const VideoCaptureDevice::Name& device, 40 const VideoCaptureDevice::Name& device,
41 VideoCaptureFormats* supported_formats) OVERRIDE; 41 VideoCaptureFormats* supported_formats) override;
42 42
43 private: 43 private:
44 44
45 DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceFactoryAndroid);}; 45 DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceFactoryAndroid);};
46 } // namespace media 46 } // namespace media
47 47
48 #endif // MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_ 48 #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') | media/video/capture/fake_video_capture_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698