| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "media/capture/ipc/capture_param_traits.h" | 5 #include "media/capture/ipc/capture_param_traits.h" |
| 6 | 6 |
| 7 #include "base/strings/stringprintf.h" | 7 #include "base/strings/stringprintf.h" |
| 8 #include "ipc/ipc_message_utils.h" | 8 #include "ipc/ipc_message_utils.h" |
| 9 #include "media/base/ipc/media_param_traits.h" |
| 9 #include "media/base/limits.h" | 10 #include "media/base/limits.h" |
| 10 #include "media/capture/video_capture_types.h" | 11 #include "media/capture/video_capture_types.h" |
| 11 #include "ui/gfx/ipc/geometry/gfx_param_traits.h" | 12 #include "ui/gfx/ipc/geometry/gfx_param_traits.h" |
| 12 #include "ui/gfx/ipc/gfx_param_traits.h" | 13 #include "ui/gfx/ipc/gfx_param_traits.h" |
| 13 #include "ui/gfx/ipc/skia/gfx_skia_param_traits.h" | 14 #include "ui/gfx/ipc/skia/gfx_skia_param_traits.h" |
| 14 | 15 |
| 15 using media::VideoCaptureFormat; | 16 using media::VideoCaptureFormat; |
| 16 | 17 |
| 17 namespace IPC { | 18 namespace IPC { |
| 18 | 19 |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 #undef MEDIA_CAPTURE_IPC_CAPTURE_PARAM_TRAITS_MACROS_H_ | 73 #undef MEDIA_CAPTURE_IPC_CAPTURE_PARAM_TRAITS_MACROS_H_ |
| 73 #include "media/capture/ipc/capture_param_traits_macros.h" | 74 #include "media/capture/ipc/capture_param_traits_macros.h" |
| 74 } // namespace IPC | 75 } // namespace IPC |
| 75 | 76 |
| 76 // Generate param traits log methods. | 77 // Generate param traits log methods. |
| 77 #include "ipc/param_traits_log_macros.h" | 78 #include "ipc/param_traits_log_macros.h" |
| 78 namespace IPC { | 79 namespace IPC { |
| 79 #undef MEDIA_CAPTURE_IPC_CAPTURE_PARAM_TRAITS_MACROS_H_ | 80 #undef MEDIA_CAPTURE_IPC_CAPTURE_PARAM_TRAITS_MACROS_H_ |
| 80 #include "media/capture/ipc/capture_param_traits_macros.h" | 81 #include "media/capture/ipc/capture_param_traits_macros.h" |
| 81 } // namespace IPC | 82 } // namespace IPC |
| OLD | NEW |