| Index: content/browser/media/midi_host.h
|
| diff --git a/content/browser/media/midi_host.h b/content/browser/media/midi_host.h
|
| index fc126acd3573dc8fdc0c04842a5ba2acc7dae4ca..c563bb50f541c3d39e1d720df0639bc0a88d43bc 100644
|
| --- a/content/browser/media/midi_host.h
|
| +++ b/content/browser/media/midi_host.h
|
| @@ -22,20 +22,18 @@
|
| #include "media/midi/midi_manager.h"
|
| #include "media/midi/midi_port_info.h"
|
|
|
| -namespace media {
|
| namespace midi {
|
| class MidiManager;
|
| class MidiMessageQueue;
|
| -}
|
| -}
|
| +} // namespace midi
|
|
|
| namespace content {
|
|
|
| class CONTENT_EXPORT MidiHost : public BrowserMessageFilter,
|
| - public media::midi::MidiManagerClient {
|
| + public midi::MidiManagerClient {
|
| public:
|
| // Called from UI thread from the owner of this object.
|
| - MidiHost(int renderer_process_id, media::midi::MidiManager* midi_manager);
|
| + MidiHost(int renderer_process_id, midi::MidiManager* midi_manager);
|
|
|
| // BrowserMessageFilter implementation.
|
| void OnChannelClosing() override;
|
| @@ -43,13 +41,13 @@ class CONTENT_EXPORT MidiHost : public BrowserMessageFilter,
|
| bool OnMessageReceived(const IPC::Message& message) override;
|
|
|
| // MidiManagerClient implementation.
|
| - void CompleteStartSession(media::midi::Result result) override;
|
| - void AddInputPort(const media::midi::MidiPortInfo& info) override;
|
| - void AddOutputPort(const media::midi::MidiPortInfo& info) override;
|
| + void CompleteStartSession(midi::Result result) override;
|
| + void AddInputPort(const midi::MidiPortInfo& info) override;
|
| + void AddOutputPort(const midi::MidiPortInfo& info) override;
|
| void SetInputPortState(uint32_t port,
|
| - media::midi::MidiPortState state) override;
|
| + midi::MidiPortState state) override;
|
| void SetOutputPortState(uint32_t port,
|
| - media::midi::MidiPortState state) override;
|
| + midi::MidiPortState state) override;
|
| void ReceiveMidiData(uint32_t port,
|
| const uint8_t* data,
|
| size_t length,
|
| @@ -96,10 +94,10 @@ class CONTENT_EXPORT MidiHost : public BrowserMessageFilter,
|
| // does not support MIDI. If not supported then a call to
|
| // OnRequestAccess() will always refuse access and a call to
|
| // OnSendData() will do nothing.
|
| - media::midi::MidiManager* midi_manager_;
|
| + midi::MidiManager* midi_manager_;
|
|
|
| // Buffers where data sent from each MIDI input port is stored.
|
| - ScopedVector<media::midi::MidiMessageQueue> received_messages_queues_;
|
| + ScopedVector<midi::MidiMessageQueue> received_messages_queues_;
|
|
|
| // Protects access to |received_messages_queues_|;
|
| base::Lock messages_queues_lock_;
|
|
|