| OLD | NEW |
|---|
| 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_USB_MIDI_INPUT_STREAM_H_ | 5 #ifndef MEDIA_MIDI_USB_MIDI_INPUT_STREAM_H_ |
| 6 #define MEDIA_MIDI_USB_MIDI_INPUT_STREAM_H_ | 6 #define MEDIA_MIDI_USB_MIDI_INPUT_STREAM_H_ |
| 7 | 7 |
| 8 #include <stddef.h> |
| 9 #include <stdint.h> |
| 10 |
| 8 #include <map> | 11 #include <map> |
| 9 #include <vector> | 12 #include <vector> |
| 10 | 13 |
| 11 #include "base/containers/hash_tables.h" | 14 #include "base/containers/hash_tables.h" |
| 12 #include "base/macros.h" | 15 #include "base/macros.h" |
| 13 #include "base/time/time.h" | 16 #include "base/time/time.h" |
| 14 #include "media/midi/usb_midi_export.h" | 17 #include "media/midi/usb_midi_export.h" |
| 15 #include "media/midi/usb_midi_jack.h" | 18 #include "media/midi/usb_midi_jack.h" |
| 16 | 19 |
| 17 namespace media { | 20 namespace media { |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 // Not owned | 82 // Not owned |
| 80 Delegate* delegate_; | 83 Delegate* delegate_; |
| 81 | 84 |
| 82 DISALLOW_COPY_AND_ASSIGN(UsbMidiInputStream); | 85 DISALLOW_COPY_AND_ASSIGN(UsbMidiInputStream); |
| 83 }; | 86 }; |
| 84 | 87 |
| 85 } // namespace midi | 88 } // namespace midi |
| 86 } // namespace media | 89 } // namespace media |
| 87 | 90 |
| 88 #endif // MEDIA_MIDI_USB_MIDI_INPUT_STREAM_H_ | 91 #endif // MEDIA_MIDI_USB_MIDI_INPUT_STREAM_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1542013004:
Switch to standard integer types in media/, take 2. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master