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

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

Issue 2418493002: //media/midi: use top level namespace midi rather than media.midi (Closed)
Patch Set: one more rename to be consistent Created 4 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
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 <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
11 #include <memory> 11 #include <memory>
12 #include <utility> 12 #include <utility>
13 #include <vector> 13 #include <vector>
14 14
15 #include "base/bind.h" 15 #include "base/bind.h"
16 #include "base/callback.h" 16 #include "base/callback.h"
17 #include "base/compiler_specific.h" 17 #include "base/compiler_specific.h"
18 #include "base/containers/hash_tables.h" 18 #include "base/containers/hash_tables.h"
19 #include "base/macros.h" 19 #include "base/macros.h"
20 #include "base/synchronization/lock.h" 20 #include "base/synchronization/lock.h"
21 #include "base/time/time.h" 21 #include "base/time/time.h"
22 #include "media/midi/midi_manager.h" 22 #include "media/midi/midi_manager.h"
23 #include "media/midi/usb_midi_device.h" 23 #include "media/midi/usb_midi_device.h"
24 #include "media/midi/usb_midi_export.h" 24 #include "media/midi/usb_midi_export.h"
25 #include "media/midi/usb_midi_input_stream.h" 25 #include "media/midi/usb_midi_input_stream.h"
26 #include "media/midi/usb_midi_jack.h" 26 #include "media/midi/usb_midi_jack.h"
27 #include "media/midi/usb_midi_output_stream.h" 27 #include "media/midi/usb_midi_output_stream.h"
28 28
29 namespace media {
30 namespace midi { 29 namespace midi {
31 30
32 class MidiScheduler; 31 class MidiScheduler;
33 32
34 // MidiManager for USB-MIDI. 33 // MidiManager for USB-MIDI.
35 class USB_MIDI_EXPORT MidiManagerUsb 34 class USB_MIDI_EXPORT MidiManagerUsb
36 : public MidiManager, 35 : public MidiManager,
37 public UsbMidiDeviceDelegate, 36 public UsbMidiDeviceDelegate,
38 NON_EXPORTED_BASE(public UsbMidiInputStream::Delegate) { 37 NON_EXPORTED_BASE(public UsbMidiInputStream::Delegate) {
39 public: 38 public:
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 93
95 // Lock to ensure the MidiScheduler is being destructed only once in 94 // Lock to ensure the MidiScheduler is being destructed only once in
96 // Finalize() on Chrome_IOThread. 95 // Finalize() on Chrome_IOThread.
97 base::Lock scheduler_lock_; 96 base::Lock scheduler_lock_;
98 std::unique_ptr<MidiScheduler> scheduler_; 97 std::unique_ptr<MidiScheduler> scheduler_;
99 98
100 DISALLOW_COPY_AND_ASSIGN(MidiManagerUsb); 99 DISALLOW_COPY_AND_ASSIGN(MidiManagerUsb);
101 }; 100 };
102 101
103 } // namespace midi 102 } // namespace midi
104 } // namespace media
105 103
106 #endif // MEDIA_MIDI_MIDI_MANAGER_USB_H_ 104 #endif // MEDIA_MIDI_MIDI_MANAGER_USB_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698