Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / media / video / capture / android / video_capture_device_factory_android.h

diff --git a/src/media/video/capture/android/video_capture_device_factory_android.h b/src/media/video/capture/android/video_capture_device_factory_android.h
index d87416f..4ea4ad5 100644 (file)
--- a/src/media/video/capture/android/video_capture_device_factory_android.h
+++ b/src/media/video/capture/android/video_capture_device_factory_android.h
@@ -19,12 +19,6 @@ namespace media {
 class MEDIA_EXPORT VideoCaptureDeviceFactoryAndroid :
   public VideoCaptureDeviceFactory {
  public:
-  // Automatically generated enum to interface with Java world.
-  enum AndroidImageFormat {
-#define DEFINE_ANDROID_IMAGEFORMAT(name, value) name = value,
-#include "media/video/capture/android/imageformat_list.h"
-#undef DEFINE_ANDROID_IMAGEFORMAT
-  };
   static bool RegisterVideoCaptureDeviceFactory(JNIEnv* env);
   static base::android::ScopedJavaLocalRef<jobject> createVideoCaptureAndroid(
       int id,
@@ -34,11 +28,11 @@ class MEDIA_EXPORT VideoCaptureDeviceFactoryAndroid :
   virtual ~VideoCaptureDeviceFactoryAndroid() {}
 
   virtual scoped_ptr<VideoCaptureDevice> Create(
-      const VideoCaptureDevice::Name& device_name) OVERRIDE;
-  virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names) OVERRIDE;
+      const VideoCaptureDevice::Name& device_name) override;
+  virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names) override;
   virtual void GetDeviceSupportedFormats(
       const VideoCaptureDevice::Name& device,
-      VideoCaptureFormats* supported_formats) OVERRIDE;
+      VideoCaptureFormats* supported_formats) override;
 
  private: