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_DEVICE_ANDROID_H_ | 5 #ifndef MEDIA_MIDI_USB_MIDI_DEVICE_ANDROID_H_ |
6 #define MEDIA_MIDI_USB_MIDI_DEVICE_ANDROID_H_ | 6 #define MEDIA_MIDI_USB_MIDI_DEVICE_ANDROID_H_ |
7 | 7 |
8 #include <jni.h> | 8 #include <jni.h> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
12 #include "base/android/scoped_java_ref.h" | 12 #include "base/android/scoped_java_ref.h" |
13 #include "base/callback.h" | 13 #include "base/callback.h" |
| 14 #include "base/macros.h" |
14 #include "media/midi/usb_midi_device.h" | 15 #include "media/midi/usb_midi_device.h" |
15 #include "media/midi/usb_midi_export.h" | 16 #include "media/midi/usb_midi_export.h" |
16 | 17 |
17 namespace media { | 18 namespace media { |
18 namespace midi { | 19 namespace midi { |
19 | 20 |
20 class USB_MIDI_EXPORT UsbMidiDeviceAndroid : public UsbMidiDevice { | 21 class USB_MIDI_EXPORT UsbMidiDeviceAndroid : public UsbMidiDevice { |
21 public: | 22 public: |
22 static scoped_ptr<Factory> CreateFactory(); | 23 static scoped_ptr<Factory> CreateFactory(); |
23 | 24 |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 std::string product_; | 56 std::string product_; |
56 std::string device_version_; | 57 std::string device_version_; |
57 | 58 |
58 DISALLOW_IMPLICIT_CONSTRUCTORS(UsbMidiDeviceAndroid); | 59 DISALLOW_IMPLICIT_CONSTRUCTORS(UsbMidiDeviceAndroid); |
59 }; | 60 }; |
60 | 61 |
61 } // namespace midi | 62 } // namespace midi |
62 } // namespace media | 63 } // namespace media |
63 | 64 |
64 #endif // MEDIA_MIDI_USB_MIDI_DEVICE_ANDROID_H_ | 65 #endif // MEDIA_MIDI_USB_MIDI_DEVICE_ANDROID_H_ |
OLD | NEW |