| Index: device/capture/content/capture_resolution_chooser.h
|
| diff --git a/media/capture/content/capture_resolution_chooser.h b/device/capture/content/capture_resolution_chooser.h
|
| similarity index 92%
|
| rename from media/capture/content/capture_resolution_chooser.h
|
| rename to device/capture/content/capture_resolution_chooser.h
|
| index cbc887d7462b515797aed42420f3b8a033969236..91a603d7b732c11d20057555a4cb9592bcef0287 100644
|
| --- a/media/capture/content/capture_resolution_chooser.h
|
| +++ b/device/capture/content/capture_resolution_chooser.h
|
| @@ -2,16 +2,17 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef MEDIA_CAPTURE_CONTENT_CAPTURE_RESOLUTION_CHOOSER_H_
|
| -#define MEDIA_CAPTURE_CONTENT_CAPTURE_RESOLUTION_CHOOSER_H_
|
| +#ifndef DEVICE_CAPTURE_CONTENT_CAPTURE_RESOLUTION_CHOOSER_H_
|
| +#define DEVICE_CAPTURE_CONTENT_CAPTURE_RESOLUTION_CHOOSER_H_
|
|
|
| #include <vector>
|
|
|
| +#include "device/capture/capture_export.h"
|
| #include "media/base/video_capture_types.h"
|
| -#include "media/capture/capture_export.h"
|
| #include "ui/gfx/geometry/size.h"
|
|
|
| -namespace media {
|
| +namespace device {
|
| +using media::ResolutionChangePolicy;
|
|
|
| // Encapsulates the logic that determines the capture frame resolution based on:
|
| // 1. The configured maximum frame resolution and resolution change policy.
|
| @@ -86,6 +87,6 @@ class CAPTURE_EXPORT CaptureResolutionChooser {
|
| std::vector<gfx::Size> snapped_sizes_;
|
| };
|
|
|
| -} // namespace media
|
| +} // namespace device
|
|
|
| -#endif // MEDIA_CAPTURE_CONTENT_CAPTURE_RESOLUTION_CHOOSER_H_
|
| +#endif // DEVICE_CAPTURE_CONTENT_CAPTURE_RESOLUTION_CHOOSER_H_
|
|
|