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

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

Issue 2034003002: Revert of ImageCapture: move mojom from WebKit/public to media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
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 721eb200dc2099f32d5c30e6830fdd2ae5e6eca9..43cf02e343219e86a14bb1577c0fecfd9cfc0a16 100644
--- a/third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp
+++ b/third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp
@@ -92,7 +92,7 @@
// m_streamTrack->component()->source()->id() is the renderer "name" of the camera;
// TODO(mcasas) consider sending the security origin as well:
// scriptState->getExecutionContext()->getSecurityOrigin()->toString()
- m_service->GetCapabilities(m_streamTrack->component()->source()->id(), createBaseCallback(bind<media::mojom::blink::PhotoCapabilitiesPtr>(&ImageCapture::onCapabilities, this, resolver)));
+ m_service->GetCapabilities(m_streamTrack->component()->source()->id(), createBaseCallback(bind<mojom::blink::PhotoCapabilitiesPtr>(&ImageCapture::onCapabilities, this, resolver)));
return promise;
}
@@ -161,7 +161,7 @@
}
-void ImageCapture::onCapabilities(ScriptPromiseResolver* resolver, media::mojom::blink::PhotoCapabilitiesPtr capabilities)
+void ImageCapture::onCapabilities(ScriptPromiseResolver* resolver, mojom::blink::PhotoCapabilitiesPtr capabilities)
{
DVLOG(1) << __FUNCTION__;
if (!m_serviceRequests.contains(resolver))
« no previous file with comments | « third_party/WebKit/Source/modules/imagecapture/ImageCapture.h ('k') | third_party/WebKit/Source/modules/modules.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698