Index: media/midi/midi_manager_mac.h |
diff --git a/media/midi/midi_manager_mac.h b/media/midi/midi_manager_mac.h |
index a2bf25e943dfd29ca0d8ab0b944814f7684c9494..a3440c0473f77847301671f17a85a3af766b8261 100644 |
--- a/media/midi/midi_manager_mac.h |
+++ b/media/midi/midi_manager_mac.h |
@@ -10,7 +10,6 @@ |
#include <string> |
#include <vector> |
-#include "base/basictypes.h" |
#include "base/callback.h" |
#include "base/compiler_specific.h" |
#include "base/threading/thread.h" |
@@ -30,8 +29,8 @@ class MIDI_EXPORT MidiManagerMac final : public MidiManager { |
void StartInitialization() override; |
void Finalize() override; |
void DispatchSendMidiData(MidiManagerClient* client, |
- uint32 port_index, |
- const std::vector<uint8>& data, |
+ uint32_t port_index, |
+ const std::vector<uint8_t>& data, |
double timestamp) override; |
private: |
@@ -61,18 +60,18 @@ class MIDI_EXPORT MidiManagerMac final : public MidiManager { |
// An internal callback that runs on MidiSendThread. |
void SendMidiData(MidiManagerClient* client, |
- uint32 port_index, |
- const std::vector<uint8>& data, |
+ uint32_t port_index, |
+ const std::vector<uint8_t>& data, |
double timestamp); |
// CoreMIDI |
MIDIClientRef midi_client_; |
MIDIPortRef coremidi_input_; |
MIDIPortRef coremidi_output_; |
- std::vector<uint8> midi_buffer_; |
+ std::vector<uint8_t> midi_buffer_; |
// Keeps track of the index (0-based) for each of our sources. |
- typedef std::map<MIDIEndpointRef, uint32> SourceMap; |
+ typedef std::map<MIDIEndpointRef, uint32_t> SourceMap; |
SourceMap source_map_; |
// Keeps track of all destinations. |