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

Side by Side Diff: media/midi/usb_midi_device_factory_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_android.cc ('k') | media/midi/usb_midi_device_factory_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_FACTORY_ANDROID_H_ 5 #ifndef MEDIA_MIDI_USB_MIDI_DEVICE_FACTORY_ANDROID_H_
6 #define MEDIA_MIDI_USB_MIDI_DEVICE_FACTORY_ANDROID_H_ 6 #define MEDIA_MIDI_USB_MIDI_DEVICE_FACTORY_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/android/scoped_java_ref.h" 11 #include "base/android/scoped_java_ref.h"
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/callback.h" 13 #include "base/callback.h"
14 #include "base/memory/scoped_vector.h" 14 #include "base/memory/scoped_vector.h"
15 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
16 #include "media/midi/usb_midi_device.h" 16 #include "media/midi/usb_midi_device.h"
17 #include "media/midi/usb_midi_export.h" 17 #include "media/midi/usb_midi_export.h"
18 18
19 namespace media { 19 namespace media {
20 namespace midi {
20 21
21 // This class enumerates UsbMidiDevices. 22 // This class enumerates UsbMidiDevices.
22 class USB_MIDI_EXPORT UsbMidiDeviceFactoryAndroid 23 class USB_MIDI_EXPORT UsbMidiDeviceFactoryAndroid
23 : public UsbMidiDevice::Factory { 24 : public UsbMidiDevice::Factory {
24 public: 25 public:
25 UsbMidiDeviceFactoryAndroid(); 26 UsbMidiDeviceFactoryAndroid();
26 ~UsbMidiDeviceFactoryAndroid() override; 27 ~UsbMidiDeviceFactoryAndroid() override;
27 28
28 // UsbMidiDevice::Factory implementation. 29 // UsbMidiDevice::Factory implementation.
29 void EnumerateDevices(UsbMidiDeviceDelegate* delegate, 30 void EnumerateDevices(UsbMidiDeviceDelegate* delegate,
30 Callback callback) override; 31 Callback callback) override;
31 32
32 void OnUsbMidiDeviceRequestDone(JNIEnv* env, 33 void OnUsbMidiDeviceRequestDone(JNIEnv* env,
33 jobject caller, 34 jobject caller,
34 jobjectArray devices); 35 jobjectArray devices);
35 void OnUsbMidiDeviceAttached(JNIEnv* env, jobject caller, jobject device); 36 void OnUsbMidiDeviceAttached(JNIEnv* env, jobject caller, jobject device);
36 void OnUsbMidiDeviceDetached(JNIEnv* env, jobject caller, jint index); 37 void OnUsbMidiDeviceDetached(JNIEnv* env, jobject caller, jint index);
37 38
38 static bool RegisterUsbMidiDeviceFactory(JNIEnv* env); 39 static bool RegisterUsbMidiDeviceFactory(JNIEnv* env);
39 40
40 private: 41 private:
41 base::android::ScopedJavaGlobalRef<jobject> raw_factory_; 42 base::android::ScopedJavaGlobalRef<jobject> raw_factory_;
42 // Not owned. 43 // Not owned.
43 UsbMidiDeviceDelegate* delegate_; 44 UsbMidiDeviceDelegate* delegate_;
44 Callback callback_; 45 Callback callback_;
45 46
46 DISALLOW_COPY_AND_ASSIGN(UsbMidiDeviceFactoryAndroid); 47 DISALLOW_COPY_AND_ASSIGN(UsbMidiDeviceFactoryAndroid);
47 }; 48 };
48 49
50 } // namespace midi
49 } // namespace media 51 } // namespace media
50 52
51 #endif // MEDIA_MIDI_USB_MIDI_DEVICE_FACTORY_ANDROID_H_ 53 #endif // MEDIA_MIDI_USB_MIDI_DEVICE_FACTORY_ANDROID_H_
OLDNEW
« no previous file with comments | « media/midi/usb_midi_device_android.cc ('k') | media/midi/usb_midi_device_factory_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698