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

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

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, 6 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.h
diff --git a/third_party/WebKit/Source/modules/imagecapture/ImageCapture.h b/third_party/WebKit/Source/modules/imagecapture/ImageCapture.h
index beeb30a59a6a90a3e67541ab8c464e2ea8c320b1..00c5a42d58c3fb1732c7e44e6c3e07d0ec642097 100644
--- a/third_party/WebKit/Source/modules/imagecapture/ImageCapture.h
+++ b/third_party/WebKit/Source/modules/imagecapture/ImageCapture.h
@@ -9,10 +9,10 @@
#include "bindings/core/v8/ScriptPromise.h"
#include "core/dom/ContextLifecycleObserver.h"
#include "core/events/EventTarget.h"
-#include "media/mojo/interfaces/image_capture.mojom-blink.h"
#include "modules/EventTargetModules.h"
#include "modules/ModulesExport.h"
#include "platform/AsyncMethodRunner.h"
+#include "public/platform/modules/imagecapture/image_capture.mojom-blink.h"
namespace blink {
@@ -55,13 +55,13 @@
private:
ImageCapture(ExecutionContext*, MediaStreamTrack*);
- void onCapabilities(ScriptPromiseResolver*, media::mojom::blink::PhotoCapabilitiesPtr);
+ void onCapabilities(ScriptPromiseResolver*, mojom::blink::PhotoCapabilitiesPtr);
void onTakePhoto(ScriptPromiseResolver*, const String& mimeType, mojo::WTFArray<uint8_t> data);
void onServiceConnectionError();
Member<MediaStreamTrack> m_streamTrack;
OwnPtr<WebImageCaptureFrameGrabber> m_frameGrabber;
- media::mojom::blink::ImageCapturePtr m_service;
+ mojom::blink::ImageCapturePtr m_service;
HeapHashSet<Member<ScriptPromiseResolver>> m_serviceRequests;
};
« no previous file with comments | « third_party/WebKit/Source/modules/imagecapture/DEPS ('k') | third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698