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

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

Issue 1086073004: Web MIDI: namespace change from media to media::midi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@null
Patch Set: (rebase) Created 5 years, 7 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/usb_midi_device.h ('k') | media/midi/usb_midi_device_android.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_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/basictypes.h" 13 #include "base/basictypes.h"
14 #include "base/callback.h" 14 #include "base/callback.h"
15 #include "media/midi/usb_midi_device.h" 15 #include "media/midi/usb_midi_device.h"
16 #include "media/midi/usb_midi_export.h" 16 #include "media/midi/usb_midi_export.h"
17 17
18 namespace media { 18 namespace media {
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 typedef base::android::ScopedJavaLocalRef<jobject> ObjectRef; 23 typedef base::android::ScopedJavaLocalRef<jobject> ObjectRef;
23 24
24 static scoped_ptr<Factory> CreateFactory(); 25 static scoped_ptr<Factory> CreateFactory();
25 26
26 UsbMidiDeviceAndroid(ObjectRef raw_device, UsbMidiDeviceDelegate* delegate); 27 UsbMidiDeviceAndroid(ObjectRef raw_device, UsbMidiDeviceDelegate* delegate);
27 ~UsbMidiDeviceAndroid() override; 28 ~UsbMidiDeviceAndroid() override;
28 29
(...skipping 23 matching lines...) Expand all
52 UsbMidiDeviceDelegate* delegate_; 53 UsbMidiDeviceDelegate* delegate_;
53 54
54 std::vector<uint8> descriptors_; 55 std::vector<uint8> descriptors_;
55 std::string manufacturer_; 56 std::string manufacturer_;
56 std::string product_; 57 std::string product_;
57 std::string device_version_; 58 std::string device_version_;
58 59
59 DISALLOW_IMPLICIT_CONSTRUCTORS(UsbMidiDeviceAndroid); 60 DISALLOW_IMPLICIT_CONSTRUCTORS(UsbMidiDeviceAndroid);
60 }; 61 };
61 62
63 } // namespace midi
62 } // namespace media 64 } // namespace media
63 65
64 #endif // MEDIA_MIDI_USB_MIDI_DEVICE_ANDROID_H_ 66 #endif // MEDIA_MIDI_USB_MIDI_DEVICE_ANDROID_H_
OLDNEW
« no previous file with comments | « media/midi/usb_midi_device.h ('k') | media/midi/usb_midi_device_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698