| 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_
|
|
|