| Index: services/video_capture/public/interfaces/capture_settings_traits.cc
|
| diff --git a/services/video_capture/public/interfaces/video_capture_settings_traits.cc b/services/video_capture/public/interfaces/capture_settings_traits.cc
|
| similarity index 55%
|
| rename from services/video_capture/public/interfaces/video_capture_settings_traits.cc
|
| rename to services/video_capture/public/interfaces/capture_settings_traits.cc
|
| index 8de4fdc04928d84f70dffd808e631277dca99645..d6b3c41dd36a9d53b3c17d3f0ac99a68fad24ef0 100644
|
| --- a/services/video_capture/public/interfaces/video_capture_settings_traits.cc
|
| +++ b/services/video_capture/public/interfaces/capture_settings_traits.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "services/video_capture/public/interfaces/video_capture_settings_traits.h"
|
| +#include "services/video_capture/public/interfaces/capture_settings_traits.h"
|
|
|
| #include "media/capture/mojo/video_capture_types_typemap_traits.h"
|
| #include "ui/gfx/geometry/mojo/geometry_struct_traits.h"
|
| @@ -10,10 +10,10 @@
|
| namespace mojo {
|
|
|
| // static
|
| -bool StructTraits<video_capture::mojom::VideoCaptureFormatDataView,
|
| - video_capture::VideoCaptureFormat>::
|
| - Read(video_capture::mojom::VideoCaptureFormatDataView data,
|
| - video_capture::VideoCaptureFormat* out) {
|
| +bool StructTraits<video_capture::mojom::I420CaptureFormatDataView,
|
| + video_capture::I420CaptureFormat>::
|
| + Read(video_capture::mojom::I420CaptureFormatDataView data,
|
| + video_capture::I420CaptureFormat* out) {
|
| if (!data.ReadFrameSize(&out->frame_size))
|
| return false;
|
| out->frame_rate = data.frame_rate();
|
| @@ -21,10 +21,10 @@ bool StructTraits<video_capture::mojom::VideoCaptureFormatDataView,
|
| }
|
|
|
| // static
|
| -bool StructTraits<video_capture::mojom::VideoCaptureSettingsDataView,
|
| - video_capture::VideoCaptureSettings>::
|
| - Read(video_capture::mojom::VideoCaptureSettingsDataView data,
|
| - video_capture::VideoCaptureSettings* out) {
|
| +bool StructTraits<video_capture::mojom::CaptureSettingsDataView,
|
| + video_capture::CaptureSettings>::
|
| + Read(video_capture::mojom::CaptureSettingsDataView data,
|
| + video_capture::CaptureSettings* out) {
|
| if (!data.ReadFormat(&out->format))
|
| return false;
|
| if (!data.ReadResolutionChangePolicy(&out->resolution_change_policy))
|
|
|