Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(770)

Unified Diff: content/common/media/midi_messages.h

Issue 2404443002: Web MIDI: use midi_service.mojom for media::midi::Result (Closed)
Patch Set: yhirano@ review Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/common/media/midi_messages.h
diff --git a/content/common/media/midi_messages.h b/content/common/media/midi_messages.h
index 44747a9b957daa9171b1ae7fde850ccf35fb5f8d..886adbe0db390516c8ea0f4c3ffa0eab825b3505 100644
--- a/content/common/media/midi_messages.h
+++ b/content/common/media/midi_messages.h
@@ -5,13 +5,18 @@
// IPC messages for access to MIDI hardware.
// Multiply-included message file, hence no include guard.
+// TODO(toyoshim): Mojofication is working in progress. Until the work is
+// finished, this file temporarily depends on midi_service.mojom.h.
+// Once the migration is finished, this file will be removed.
+// http://crbug.com/582327
+
#include <stdint.h>
#include "content/common/content_export.h"
#include "ipc/ipc_message_macros.h"
#include "ipc/param_traits_macros.h"
#include "media/midi/midi_port_info.h"
-#include "media/midi/result.h"
+#include "media/midi/midi_service.mojom.h"
#include "url/gurl.h"
#undef IPC_MESSAGE_EXPORT
@@ -29,7 +34,7 @@ IPC_STRUCT_TRAITS_BEGIN(midi::MidiPortInfo)
IPC_STRUCT_TRAITS_MEMBER(state)
IPC_STRUCT_TRAITS_END()
-IPC_ENUM_TRAITS_MAX_VALUE(midi::Result, midi::Result::MAX)
+IPC_ENUM_TRAITS_MAX_VALUE(midi::mojom::Result, midi::mojom::Result::MAX)
// Messages for IPC between MidiMessageFilter and MidiHost.
@@ -59,7 +64,7 @@ IPC_MESSAGE_CONTROL2(MidiMsg_SetOutputPortState,
uint32_t /* port */,
midi::MidiPortState /* state */)
-IPC_MESSAGE_CONTROL1(MidiMsg_SessionStarted, midi::Result /* result */)
+IPC_MESSAGE_CONTROL1(MidiMsg_SessionStarted, midi::mojom::Result /* result */)
IPC_MESSAGE_CONTROL3(MidiMsg_DataReceived,
uint32_t /* port */,

Powered by Google App Engine
This is Rietveld 408576698