Index: media/midi/midi_manager.h |
diff --git a/media/midi/midi_manager.h b/media/midi/midi_manager.h |
index 7ac2235b275454988b152a742699819b319dc447..f6c424b9e6f66c9525136bce6ec77ebb44d91ab0 100644 |
--- a/media/midi/midi_manager.h |
+++ b/media/midi/midi_manager.h |
@@ -93,12 +93,12 @@ class MEDIA_EXPORT MidiManager { |
// input_ports() is a list of MIDI ports for receiving MIDI data. |
// Each individual port in this list can be identified by its |
// integer index into this list. |
- const MidiPortInfoList& input_ports() { return input_ports_; } |
+ const MidiPortInfoList& input_ports() const { return input_ports_; } |
// output_ports() is a list of MIDI ports for sending MIDI data. |
// Each individual port in this list can be identified by its |
// integer index into this list. |
- const MidiPortInfoList& output_ports() { return output_ports_; } |
+ const MidiPortInfoList& output_ports() const { return output_ports_; } |
protected: |
friend class MidiManagerUsb; |
@@ -139,15 +139,11 @@ class MEDIA_EXPORT MidiManager { |
(time - base::TimeTicks()).InSecondsF()); |
} |
- size_t get_clients_size_for_testing() const { return clients_.size(); } |
- size_t get_pending_clients_size_for_testing() const { |
+ size_t clients_size_for_testing() const { return clients_.size(); } |
+ size_t pending_clients_size_for_testing() const { |
return pending_clients_.size(); |
} |
- // TODO(toyoshim): Make |input_ports_| and |output_ports_| private members. |
- MidiPortInfoList input_ports_; |
- MidiPortInfoList output_ports_; |
- |
private: |
void CompleteInitializationInternal(MidiResult result); |
@@ -174,6 +170,9 @@ class MEDIA_EXPORT MidiManager { |
// |result_|. |
base::Lock lock_; |
+ MidiPortInfoList input_ports_; |
+ MidiPortInfoList output_ports_; |
+ |
DISALLOW_COPY_AND_ASSIGN(MidiManager); |
}; |