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

Unified Diff: content/browser/media/capture/image_capture_impl.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
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/media/capture/image_capture_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/capture/image_capture_impl.h
diff --git a/content/browser/media/capture/image_capture_impl.h b/content/browser/media/capture/image_capture_impl.h
index 0e408dc175ed4b82ed97b68493d33c0f52805d55..8ca23dae59b31de51a450dab104a3010809e8bff 100644
--- a/content/browser/media/capture/image_capture_impl.h
+++ b/content/browser/media/capture/image_capture_impl.h
@@ -5,17 +5,17 @@
#ifndef CONTENT_BROWSER_MEDIA_CAPTURE_IMAGE_CAPTURE_IMPL_H_
#define CONTENT_BROWSER_MEDIA_CAPTURE_IMAGE_CAPTURE_IMPL_H_
-#include "media/mojo/interfaces/image_capture.mojom.h"
#include "mojo/public/cpp/bindings/interface_request.h"
#include "mojo/public/cpp/bindings/string.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
+#include "third_party/WebKit/public/platform/modules/imagecapture/image_capture.mojom.h"
namespace content {
-class ImageCaptureImpl : public media::mojom::ImageCapture {
+class ImageCaptureImpl : public blink::mojom::ImageCapture {
public:
static void Create(
- mojo::InterfaceRequest<media::mojom::ImageCapture> request);
+ mojo::InterfaceRequest<blink::mojom::ImageCapture> request);
~ImageCaptureImpl() override;
void GetCapabilities(const mojo::String& source_id,
@@ -26,9 +26,9 @@
private:
explicit ImageCaptureImpl(
- mojo::InterfaceRequest<media::mojom::ImageCapture> request);
+ mojo::InterfaceRequest<blink::mojom::ImageCapture> request);
- mojo::StrongBinding<media::mojom::ImageCapture> binding_;
+ mojo::StrongBinding<blink::mojom::ImageCapture> binding_;
DISALLOW_COPY_AND_ASSIGN(ImageCaptureImpl);
};
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/media/capture/image_capture_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698