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

Unified Diff: third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp

Issue 2798263003: Image Capture: add |supports_torch| field to mojom (Closed)
Patch Set: Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/imagecapture/resources/mock-imagecapture.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp
diff --git a/third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp b/third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp
index a460a3a0b47cbaff9b48e755343ea0e3a8f79ed7..ce49053aebb89bb09adc746f391195783bc813bb 100644
--- a/third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp
+++ b/third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp
@@ -564,10 +564,9 @@ void ImageCapture::onCapabilitiesUpdateInternal(
m_settings.setZoom(capabilities.zoom->current);
}
- m_capabilities.setTorch(capabilities.torch);
-
- // TODO(mcasas): do |torch| when the mojom interface is updated,
- // https://crbug.com/700607.
+ m_capabilities.setTorch(capabilities.supports_torch);
+ if (capabilities.supports_torch)
+ m_settings.setTorch(capabilities.torch);
}
void ImageCapture::onServiceConnectionError() {
« no previous file with comments | « third_party/WebKit/LayoutTests/imagecapture/resources/mock-imagecapture.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698