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

Unified Diff: media/midi/midi_manager_win.cc

Issue 700723004: Do not use vector<scoped_ptr<>>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 6 years, 1 month 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_win.h ('k') | win8/metro_driver/print_document_source.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/midi/midi_manager_win.cc
diff --git a/media/midi/midi_manager_win.cc b/media/midi/midi_manager_win.cc
index 439ce9357b6c93ef5dd5e96da85d5e7ad421588b..bc4b15d08d90e5f37dcf560c646802986b4b19e2 100644
--- a/media/midi/midi_manager_win.cc
+++ b/media/midi/midi_manager_win.cc
@@ -518,7 +518,7 @@ void MidiManagerWin::StartInitialization() {
base::IntToString(static_cast<int>(caps.vDriverVersion)));
AddInputPort(info);
in_device->set_port_index(inport_index++);
- in_devices_.push_back(in_device.Pass());
+ in_devices_.push_back(in_device.release());
}
const UINT num_out_devices = midiOutGetNumDevs();
@@ -540,7 +540,7 @@ void MidiManagerWin::StartInitialization() {
base::WideToUTF8(caps.szPname),
base::IntToString(static_cast<int>(caps.vDriverVersion)));
AddOutputPort(info);
- out_devices_.push_back(out_port.Pass());
+ out_devices_.push_back(out_port.release());
}
CompleteInitialization(MIDI_OK);
@@ -575,7 +575,7 @@ void MidiManagerWin::DispatchSendMidiData(MidiManagerClient* client,
if (!send_thread_.IsRunning())
send_thread_.Start();
- OutDeviceInfo* out_port = out_devices_[port_index].get();
+ OutDeviceInfo* out_port = out_devices_[port_index];
send_thread_.message_loop()->PostDelayedTask(
FROM_HERE,
base::Bind(&OutDeviceInfo::Send, base::Unretained(out_port), data),
« no previous file with comments | « media/midi/midi_manager_win.h ('k') | win8/metro_driver/print_document_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698