| Index: media/capture/video/android/photo_capabilities.h
|
| diff --git a/media/capture/video/android/photo_capabilities.h b/media/capture/video/android/photo_capabilities.h
|
| index 80363fc797f022d3517ef6142f297acc0b023a86..75f12cd7ccdfced87283ec4c2f02de13cb3ffccd 100644
|
| --- a/media/capture/video/android/photo_capabilities.h
|
| +++ b/media/capture/video/android/photo_capabilities.h
|
| @@ -14,10 +14,12 @@ namespace media {
|
|
|
| class PhotoCapabilities {
|
| public:
|
| - // Focus modes from Java side, equivalent to media.mojom::FocusMode.
|
| + // Focus modes from Java side, equivalent to media.mojom::MeteringMode, except
|
| + // NOT_SET, which is used to signify absence of setting configuration.
|
| // A Java counterpart will be generated for this enum.
|
| // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.media
|
| - enum class AndroidFocusMode {
|
| + enum class AndroidMeteringMode {
|
| + NOT_SET,
|
| UNAVAILABLE,
|
| FIXED,
|
| SINGLE_SHOT,
|
| @@ -39,7 +41,8 @@ class PhotoCapabilities {
|
| int getMinZoom() const;
|
| int getMaxZoom() const;
|
| int getCurrentZoom() const;
|
| - AndroidFocusMode getFocusMode() const;
|
| + AndroidMeteringMode getFocusMode() const;
|
| + AndroidMeteringMode getExposureMode() const;
|
|
|
| private:
|
| const base::android::ScopedJavaLocalRef<jobject> object_;
|
|
|