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

Unified Diff: media/midi/midi_manager_usb.h

Issue 2895573002: Reland of Remove ScopedVector from all other codes in media/ (Closed)
Patch Set: Fix the compile fails in build target "jpeg_decode_accelerator_unittest" Created 3 years, 7 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
« no previous file with comments | « media/midi/midi_manager_unittest.cc ('k') | media/midi/midi_manager_usb.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/midi/midi_manager_usb.h
diff --git a/media/midi/midi_manager_usb.h b/media/midi/midi_manager_usb.h
index 8f57d56531e55e3cb643c39ec920b4a2c0fcdfea..093dfd093898a0932f9a7caf2b8bf1b234181811 100644
--- a/media/midi/midi_manager_usb.h
+++ b/media/midi/midi_manager_usb.h
@@ -64,7 +64,8 @@ class USB_MIDI_EXPORT MidiManagerUsb
size_t size,
base::TimeTicks time) override;
- const ScopedVector<UsbMidiOutputStream>& output_streams() const {
+ const std::vector<std::unique_ptr<UsbMidiOutputStream>>& output_streams()
+ const {
return output_streams_;
}
const UsbMidiInputStream* input_stream() const { return input_stream_.get(); }
@@ -83,8 +84,8 @@ class USB_MIDI_EXPORT MidiManagerUsb
bool AddPorts(UsbMidiDevice* device, int device_id);
std::unique_ptr<UsbMidiDevice::Factory> device_factory_;
- ScopedVector<UsbMidiDevice> devices_;
- ScopedVector<UsbMidiOutputStream> output_streams_;
+ std::vector<std::unique_ptr<UsbMidiDevice>> devices_;
+ std::vector<std::unique_ptr<UsbMidiOutputStream>> output_streams_;
std::unique_ptr<UsbMidiInputStream> input_stream_;
base::Callback<void(mojom::Result result)> initialize_callback_;
« no previous file with comments | « media/midi/midi_manager_unittest.cc ('k') | media/midi/midi_manager_usb.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698