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

Unified Diff: device/capture/video/scoped_result_callback.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
« no previous file with comments | « device/capture/video/mac/video_capture_device_mac.mm ('k') | device/capture/video/video_capture_device.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/capture/video/scoped_result_callback.h
diff --git a/media/capture/video/scoped_result_callback.h b/device/capture/video/scoped_result_callback.h
similarity index 87%
rename from media/capture/video/scoped_result_callback.h
rename to device/capture/video/scoped_result_callback.h
index af4edc1740504fa04b343400a30ee6a8d7deba88..8efab2f9463311651003cff4deb979c95cc62e70 100644
--- a/media/capture/video/scoped_result_callback.h
+++ b/device/capture/video/scoped_result_callback.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MEDIA_CAPTURE_VIDEO_SCOPED_RESULT_CALLBACK_H_
-#define MEDIA_CAPTURE_VIDEO_SCOPED_RESULT_CALLBACK_H_
+#ifndef DEVICE_CAPTURE_VIDEO_SCOPED_RESULT_CALLBACK_H_
+#define DEVICE_CAPTURE_VIDEO_SCOPED_RESULT_CALLBACK_H_
#include "base/callback.h"
#include "base/callback_helpers.h"
#include "base/macros.h"
-namespace media {
+namespace device {
// This class guarantees that |callback_| has either been called or will pass it
// to |on_error_callback_| on destruction. Inspired by ScopedWebCallbacks<>.
@@ -51,6 +51,6 @@ class ScopedResultCallback {
DISALLOW_COPY_AND_ASSIGN(ScopedResultCallback);
};
-} // namespace media
+} // namespace device
-#endif // MEDIA_CAPTURE_VIDEO_SCOPED_RESULT_CALLBACK_H_
+#endif // DEVICE_CAPTURE_VIDEO_SCOPED_RESULT_CALLBACK_H_
« no previous file with comments | « device/capture/video/mac/video_capture_device_mac.mm ('k') | device/capture/video/video_capture_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698