diff options
| author | charliea <charliea@google.com> | 2015-01-26 09:35:41 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-26 17:36:51 +0000 |
| commit | 3be83970173f29ff3fec067fe64ff9910ce53c73 (patch) | |
| tree | fc4b06ee8ee1f66001eb379412d35d234711bf93 /media/midi | |
| parent | 4bf260f81b3909da9099e5bcac948cbc0ca5e295 (diff) | |
| download | chromium_src-3be83970173f29ff3fec067fe64ff9910ce53c73.zip chromium_src-3be83970173f29ff3fec067fe64ff9910ce53c73.tar.gz chromium_src-3be83970173f29ff3fec067fe64ff9910ce53c73.tar.bz2 | |
Replaces instances of the deprecated TimeTicks::HighResNow() with TimeTicks::Now().
BUG=
Review URL: https://codereview.chromium.org/864943002
Cr-Commit-Position: refs/heads/master@{#313084}
Diffstat (limited to 'media/midi')
| -rw-r--r-- | media/midi/midi_manager_alsa.cc | 3 | ||||
| -rw-r--r-- | media/midi/usb_midi_device_android.cc | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/media/midi/midi_manager_alsa.cc b/media/midi/midi_manager_alsa.cc index 37cbbebb..e4cadfb 100644 --- a/media/midi/midi_manager_alsa.cc +++ b/media/midi/midi_manager_alsa.cc @@ -392,8 +392,7 @@ void MidiManagerAlsa::EventLoop() { // Read available incoming MIDI data. snd_seq_event_t* event; int err = snd_seq_event_input(in_client_, &event); - double timestamp = - (base::TimeTicks::HighResNow() - base::TimeTicks()).InSecondsF(); + double timestamp = (base::TimeTicks::Now() - base::TimeTicks()).InSecondsF(); if (err == -ENOSPC) { VLOG(1) << "snd_seq_event_input detected buffer overrun"; diff --git a/media/midi/usb_midi_device_android.cc b/media/midi/usb_midi_device_android.cc index 8f93c3d..ff58e62 100644 --- a/media/midi/usb_midi_device_android.cc +++ b/media/midi/usb_midi_device_android.cc @@ -56,7 +56,7 @@ void UsbMidiDeviceAndroid::OnData(JNIEnv* env, const uint8* head = bytes.size() ? &bytes[0] : NULL; delegate_->ReceiveUsbMidiData(this, endpoint_number, head, bytes.size(), - base::TimeTicks::HighResNow()); + base::TimeTicks::Now()); } bool UsbMidiDeviceAndroid::RegisterUsbMidiDevice(JNIEnv* env) { |