| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 // IPC messages for the Media Session API. | 5 // IPC messages for the Media Session API. |
| 6 // Multiply-included message file, hence no include guard. | 6 // Multiply-included message file, hence no include guard. |
| 7 | 7 |
| 8 #include "base/optional.h" |
| 8 #include "content/common/android/gin_java_bridge_errors.h" | 9 #include "content/common/android/gin_java_bridge_errors.h" |
| 9 #include "content/common/content_export.h" | 10 #include "content/common/content_export.h" |
| 10 #include "content/public/common/media_metadata.h" | 11 #include "content/public/common/media_metadata.h" |
| 11 #include "ipc/ipc_message_macros.h" | 12 #include "ipc/ipc_message_macros.h" |
| 12 | 13 |
| 13 #undef IPC_MESSAGE_EXPORT | 14 #undef IPC_MESSAGE_EXPORT |
| 14 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT | 15 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT |
| 15 #define IPC_MESSAGE_START MediaSessionMsgStart | 16 #define IPC_MESSAGE_START MediaSessionMsgStart |
| 16 | 17 |
| 17 IPC_STRUCT_TRAITS_BEGIN(content::MediaMetadata) | 18 IPC_STRUCT_TRAITS_BEGIN(content::MediaMetadata) |
| (...skipping 16 matching lines...) Expand all Loading... |
| 34 IPC_MESSAGE_ROUTED2(MediaSessionHostMsg_Activate, | 35 IPC_MESSAGE_ROUTED2(MediaSessionHostMsg_Activate, |
| 35 int /* session_id */, | 36 int /* session_id */, |
| 36 int /* request_id */) | 37 int /* request_id */) |
| 37 | 38 |
| 38 IPC_MESSAGE_ROUTED2(MediaSessionHostMsg_Deactivate, | 39 IPC_MESSAGE_ROUTED2(MediaSessionHostMsg_Deactivate, |
| 39 int /* session_id */, | 40 int /* session_id */, |
| 40 int /* request_id */) | 41 int /* request_id */) |
| 41 | 42 |
| 42 IPC_MESSAGE_ROUTED2(MediaSessionHostMsg_SetMetadata, | 43 IPC_MESSAGE_ROUTED2(MediaSessionHostMsg_SetMetadata, |
| 43 int /* request_id*/, | 44 int /* request_id*/, |
| 44 content::MediaMetadata /* metadata */) | 45 base::Optional<content::MediaMetadata> /* metadata */) |
| OLD | NEW |