| Index: media/midi/midi_manager_usb.cc
|
| diff --git a/media/midi/midi_manager_usb.cc b/media/midi/midi_manager_usb.cc
|
| index b2d90c59ac4328d87c96619d2ae1d68aa486430f..0f08a0e2fa8feb17ba6744f710184260ea5f8669 100644
|
| --- a/media/midi/midi_manager_usb.cc
|
| +++ b/media/midi/midi_manager_usb.cc
|
| @@ -33,7 +33,8 @@ void MidiManagerUsb::Finalize() {
|
| scheduler_.reset();
|
| }
|
|
|
| -void MidiManagerUsb::Initialize(base::Callback<void(Result result)> callback) {
|
| +void MidiManagerUsb::Initialize(
|
| + base::Callback<void(mojom::Result result)> callback) {
|
| initialize_callback_ = callback;
|
|
|
| {
|
| @@ -115,18 +116,18 @@ void MidiManagerUsb::OnReceivedData(size_t jack_index,
|
| void MidiManagerUsb::OnEnumerateDevicesDone(bool result,
|
| UsbMidiDevice::Devices* devices) {
|
| if (!result) {
|
| - initialize_callback_.Run(Result::INITIALIZATION_ERROR);
|
| + initialize_callback_.Run(mojom::Result::INITIALIZATION_ERROR);
|
| return;
|
| }
|
| input_stream_.reset(new UsbMidiInputStream(this));
|
| devices->swap(devices_);
|
| for (size_t i = 0; i < devices_.size(); ++i) {
|
| if (!AddPorts(devices_[i], static_cast<int>(i))) {
|
| - initialize_callback_.Run(Result::INITIALIZATION_ERROR);
|
| + initialize_callback_.Run(mojom::Result::INITIALIZATION_ERROR);
|
| return;
|
| }
|
| }
|
| - initialize_callback_.Run(Result::OK);
|
| + initialize_callback_.Run(mojom::Result::OK);
|
| }
|
|
|
| bool MidiManagerUsb::AddPorts(UsbMidiDevice* device, int device_id) {
|
|
|