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

Unified Diff: device/capture/content/thread_safe_capture_oracle.h

Issue 2214533002: move //media/capture to //device/capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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: device/capture/content/thread_safe_capture_oracle.h
diff --git a/media/capture/content/thread_safe_capture_oracle.h b/device/capture/content/thread_safe_capture_oracle.h
similarity index 92%
rename from media/capture/content/thread_safe_capture_oracle.h
rename to device/capture/content/thread_safe_capture_oracle.h
index f54315bc8b39e51c0442c8799520524c38bf5957..e3079eed3059b9cf914261c2ea536fdae30d7ece 100644
--- a/media/capture/content/thread_safe_capture_oracle.h
+++ b/device/capture/content/thread_safe_capture_oracle.h
@@ -2,26 +2,28 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MEDIA_CAPTURE_CONTENT_THREAD_SAFE_CAPTURE_ORACLE_H_
-#define MEDIA_CAPTURE_CONTENT_THREAD_SAFE_CAPTURE_ORACLE_H_
+#ifndef DEVICE_CAPTURE_CONTENT_THREAD_SAFE_CAPTURE_ORACLE_H_
+#define DEVICE_CAPTURE_CONTENT_THREAD_SAFE_CAPTURE_ORACLE_H_
#include <memory>
#include <string>
#include "base/memory/ref_counted.h"
+#include "device/capture/capture_export.h"
+#include "device/capture/content/video_capture_oracle.h"
+#include "device/capture/video/video_capture_device.h"
#include "media/base/video_frame.h"
-#include "media/capture/capture_export.h"
-#include "media/capture/content/video_capture_oracle.h"
-#include "media/capture/video/video_capture_device.h"
+
+namespace media {
+struct VideoCaptureParams;
+class VideoFrame;
+} // namespace media
namespace tracked_objects {
class Location;
} // namespace tracked_objects
-namespace media {
-
-struct VideoCaptureParams;
-class VideoFrame;
+namespace device {
// Thread-safe, refcounted proxy to the VideoCaptureOracle. This proxy wraps
// the VideoCaptureOracle, which decides which frames to capture, and a
@@ -122,6 +124,6 @@ class CAPTURE_EXPORT ThreadSafeCaptureOracle
const VideoCaptureParams params_;
};
-} // namespace media
+} // namespace device
-#endif // MEDIA_CAPTURE_CONTENT_THREAD_SAFE_CAPTURE_ORACLE_H_
+#endif // DEVICE_CAPTURE_CONTENT_THREAD_SAFE_CAPTURE_ORACLE_H_
« no previous file with comments | « device/capture/content/smooth_event_sampler_unittest.cc ('k') | device/capture/content/thread_safe_capture_oracle.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698