Web MIDI: make input_ports_ and output_ports_ members private

media/midi/midi_manager.h

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_MIDI_MIDI_MANAGER_H_
 #define MEDIA_MIDI_MIDI_MANAGER_H_
 
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 73 matching lines @@
   // means send "now" or as soon as possible.
   // The default implementation is for unsupported platforms.
   virtual void DispatchSendMidiData(MidiManagerClient* client,
                                     uint32 port_index,
                                     const std::vector<uint8>& data,
                                     double timestamp);
 
   // 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& get_input_ports() { return input_ports_; }

[yukawa, 2014/05/07 00:29:57]

... const { ... }

BTW, |input_ports()| seems to be recommended in Google C++ style. 
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml

| Accessors and mutators (get and set functions) should match
| the name of the variable they are getting and setting.

Anyway, I don't have strong opinion here. Just FYI.

[Takashi Toyoshima, 2014/05/07 02:28:26]

Oh, that's misunderstanding. Fixed.

 
   // 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& get_output_ports() { return output_ports_; }

[yukawa, 2014/05/07 00:29:57]

... const { }

[Takashi Toyoshima, 2014/05/07 02:28:26]

Thanks for catching them. I'm relatively lazy to find out const points, so these
comments are useful.

 
  protected:
   friend class MidiManagerUsb;
 
   // Initializes the platform dependent MIDI system. MidiManager class has a
   // default implementation that synchronously calls CompleteInitialization()
   // with MIDI_NOT_SUPPORTED on the caller thread. A derived class for a
   // specific platform should override this method correctly.
   // This method is called on Chrome_IOThread thread inside StartSession().
   // Platform dependent initialization can be processed synchronously or
   // asynchronously. When the initialization is completed,
   // CompleteInitialization() should be called with |result|.
   // |result| should be MIDI_OK on success, otherwise a proper MidiResult.
   virtual void StartInitialization();
 
   // Called from a platform dependent implementation of StartInitialization().
   // It invokes CompleteInitializationInternal() on the thread that calls
   // StartSession() and distributes |result| to MIDIManagerClient objects in
   // |pending_clients_|.
   void CompleteInitialization(MidiResult result);
 
   void AddInputPort(const MidiPortInfo& info);
   void AddOutputPort(const MidiPortInfo& info);
+  void ClearInputOutputPorts();
 
   // Dispatches to all clients.
   // TODO(toyoshim): Fix the mac implementation to use
   // |ReceiveMidiData(..., base::TimeTicks)|.
   void ReceiveMidiData(uint32 port_index,
                        const uint8* data,
                        size_t length,
                        double timestamp);
 
   void ReceiveMidiData(uint32 port_index,
                        const uint8* data,
                        size_t length,
                        base::TimeTicks time) {
     ReceiveMidiData(port_index, data, length,
                     (time - base::TimeTicks()).InSecondsF());
   }
 
   size_t get_clients_size_for_testing() const { return clients_.size(); }
   size_t get_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);
 
   // Keeps track of all clients who wish to receive MIDI data.
   typedef std::set<MidiManagerClient*> ClientList;
   ClientList clients_;
 
   // Keeps track of all clients who are waiting for CompleteStartSession().
   typedef std::map<int, MidiManagerClient*> PendingClientMap;
   PendingClientMap pending_clients_;
 
   // Keeps a SingleThreadTaskRunner of the thread that calls StartSession in
   // order to invoke CompleteStartSession() on the thread.
   scoped_refptr<base::SingleThreadTaskRunner> session_thread_runner_;
 
   // Keeps true if platform dependent initialization is already completed.
   bool initialized_;
 
   // Keeps the platform dependent initialization result if initialization is
   // completed. Otherwise keeps MIDI_NOT_SUPPORTED.
   MidiResult result_;
 
   // Protects access to |clients_|, |pending_clients_|, |initialized_|, and
   // |result_|.
   base::Lock lock_;
 
+  MidiPortInfoList input_ports_;
+  MidiPortInfoList output_ports_;
+
   DISALLOW_COPY_AND_ASSIGN(MidiManager);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MIDI_MIDI_MANAGER_H_