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

Side by Side Diff: media/midi/midi_manager_usb.h

Issue 623263003: replace OVERRIDE and FINAL with override and final in media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months 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 unified diff | Download patch
« no previous file with comments | « media/midi/midi_manager_unittest.cc ('k') | media/midi/midi_manager_usb_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_MIDI_MIDI_MANAGER_USB_H_ 5 #ifndef MEDIA_MIDI_MIDI_MANAGER_USB_H_
6 #define MEDIA_MIDI_MIDI_MANAGER_USB_H_ 6 #define MEDIA_MIDI_MIDI_MANAGER_USB_H_
7 7
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 14 matching lines...) Expand all
25 25
26 // MidiManager for USB-MIDI. 26 // MidiManager for USB-MIDI.
27 class MEDIA_EXPORT MidiManagerUsb : public MidiManager, 27 class MEDIA_EXPORT MidiManagerUsb : public MidiManager,
28 public UsbMidiDeviceDelegate, 28 public UsbMidiDeviceDelegate,
29 public UsbMidiInputStream::Delegate { 29 public UsbMidiInputStream::Delegate {
30 public: 30 public:
31 explicit MidiManagerUsb(scoped_ptr<UsbMidiDevice::Factory> device_factory); 31 explicit MidiManagerUsb(scoped_ptr<UsbMidiDevice::Factory> device_factory);
32 virtual ~MidiManagerUsb(); 32 virtual ~MidiManagerUsb();
33 33
34 // MidiManager implementation. 34 // MidiManager implementation.
35 virtual void StartInitialization() OVERRIDE; 35 virtual void StartInitialization() override;
36 virtual void DispatchSendMidiData(MidiManagerClient* client, 36 virtual void DispatchSendMidiData(MidiManagerClient* client,
37 uint32 port_index, 37 uint32 port_index,
38 const std::vector<uint8>& data, 38 const std::vector<uint8>& data,
39 double timestamp) OVERRIDE; 39 double timestamp) override;
40 40
41 // UsbMidiDeviceDelegate implementation. 41 // UsbMidiDeviceDelegate implementation.
42 virtual void ReceiveUsbMidiData(UsbMidiDevice* device, 42 virtual void ReceiveUsbMidiData(UsbMidiDevice* device,
43 int endpoint_number, 43 int endpoint_number,
44 const uint8* data, 44 const uint8* data,
45 size_t size, 45 size_t size,
46 base::TimeTicks time) OVERRIDE; 46 base::TimeTicks time) override;
47 47
48 // UsbMidiInputStream::Delegate implementation. 48 // UsbMidiInputStream::Delegate implementation.
49 virtual void OnReceivedData(size_t jack_index, 49 virtual void OnReceivedData(size_t jack_index,
50 const uint8* data, 50 const uint8* data,
51 size_t size, 51 size_t size,
52 base::TimeTicks time) OVERRIDE; 52 base::TimeTicks time) override;
53 53
54 const ScopedVector<UsbMidiOutputStream>& output_streams() const { 54 const ScopedVector<UsbMidiOutputStream>& output_streams() const {
55 return output_streams_; 55 return output_streams_;
56 } 56 }
57 const UsbMidiInputStream* input_stream() const { return input_stream_.get(); } 57 const UsbMidiInputStream* input_stream() const { return input_stream_.get(); }
58 58
59 // Initializes this object. 59 // Initializes this object.
60 // When the initialization finishes, |callback| will be called with the 60 // When the initialization finishes, |callback| will be called with the
61 // result. 61 // result.
62 // When this factory is destroyed during the operation, the operation 62 // When this factory is destroyed during the operation, the operation
(...skipping 14 matching lines...) Expand all
77 77
78 // A map from <endpoint_number, cable_number> to the index of input jacks. 78 // A map from <endpoint_number, cable_number> to the index of input jacks.
79 base::hash_map<std::pair<int, int>, size_t> input_jack_dictionary_; 79 base::hash_map<std::pair<int, int>, size_t> input_jack_dictionary_;
80 80
81 DISALLOW_COPY_AND_ASSIGN(MidiManagerUsb); 81 DISALLOW_COPY_AND_ASSIGN(MidiManagerUsb);
82 }; 82 };
83 83
84 } // namespace media 84 } // namespace media
85 85
86 #endif // MEDIA_MIDI_MIDI_MANAGER_USB_H_ 86 #endif // MEDIA_MIDI_MIDI_MANAGER_USB_H_
OLDNEW
« no previous file with comments | « media/midi/midi_manager_unittest.cc ('k') | media/midi/midi_manager_usb_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698