| Index: media/capture/video/android/video_capture_device_factory_android.h
|
| diff --git a/media/capture/video/android/video_capture_device_factory_android.h b/media/capture/video/android/video_capture_device_factory_android.h
|
| deleted file mode 100644
|
| index aa1f36693ce6895edcefdaef833c06b0e0238967..0000000000000000000000000000000000000000
|
| --- a/media/capture/video/android/video_capture_device_factory_android.h
|
| +++ /dev/null
|
| @@ -1,43 +0,0 @@
|
| -// Copyright 2014 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#ifndef MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_
|
| -#define MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_
|
| -
|
| -#include "media/capture/video/video_capture_device_factory.h"
|
| -
|
| -#include <jni.h>
|
| -
|
| -#include "base/android/scoped_java_ref.h"
|
| -#include "base/macros.h"
|
| -#include "media/capture/video/video_capture_device.h"
|
| -
|
| -namespace media {
|
| -
|
| -// VideoCaptureDeviceFactory on Android. This class implements the static
|
| -// VideoCapture methods and the factory of VideoCaptureAndroid.
|
| -class CAPTURE_EXPORT VideoCaptureDeviceFactoryAndroid
|
| - : public VideoCaptureDeviceFactory {
|
| - public:
|
| - static bool RegisterVideoCaptureDeviceFactory(JNIEnv* env);
|
| - static base::android::ScopedJavaLocalRef<jobject> createVideoCaptureAndroid(
|
| - int id,
|
| - jlong nativeVideoCaptureDeviceAndroid);
|
| -
|
| - VideoCaptureDeviceFactoryAndroid() {}
|
| - ~VideoCaptureDeviceFactoryAndroid() override {}
|
| -
|
| - std::unique_ptr<VideoCaptureDevice> Create(
|
| - const VideoCaptureDevice::Name& device_name) override;
|
| - void GetDeviceNames(VideoCaptureDevice::Names* device_names) override;
|
| - void GetDeviceSupportedFormats(
|
| - const VideoCaptureDevice::Name& device,
|
| - VideoCaptureFormats* supported_formats) override;
|
| -
|
| - private:
|
| - DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceFactoryAndroid);
|
| -};
|
| -} // namespace media
|
| -
|
| -#endif // MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_
|
|
|