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

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

Issue 893363002: Update {virtual,override,final} to follow C++11 style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 10 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/base/android/video_decoder_job.h ('k') | media/midi/usb_midi_device_factory_android.h » ('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 <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 "media/base/media_export.h" 14 #include "media/base/media_export.h"
15 #include "media/midi/usb_midi_device.h" 15 #include "media/midi/usb_midi_device.h"
16 16
17 namespace media { 17 namespace media {
18 18
19 class MEDIA_EXPORT UsbMidiDeviceAndroid : public UsbMidiDevice { 19 class MEDIA_EXPORT UsbMidiDeviceAndroid : public UsbMidiDevice {
20 public: 20 public:
21 typedef base::android::ScopedJavaLocalRef<jobject> ObjectRef; 21 typedef base::android::ScopedJavaLocalRef<jobject> ObjectRef;
22 22
23 static scoped_ptr<Factory> CreateFactory(); 23 static scoped_ptr<Factory> CreateFactory();
24 24
25 UsbMidiDeviceAndroid(ObjectRef raw_device, UsbMidiDeviceDelegate* delegate); 25 UsbMidiDeviceAndroid(ObjectRef raw_device, UsbMidiDeviceDelegate* delegate);
26 virtual ~UsbMidiDeviceAndroid(); 26 ~UsbMidiDeviceAndroid() override;
27 27
28 // UsbMidiDevice implementation. 28 // UsbMidiDevice implementation.
29 virtual std::vector<uint8> GetDescriptor() override; 29 std::vector<uint8> GetDescriptor() override;
30 virtual void Send(int endpoint_number, 30 void Send(int endpoint_number, const std::vector<uint8>& data) override;
31 const std::vector<uint8>& data) override;
32 31
33 // Called by the Java world. 32 // Called by the Java world.
34 void OnData(JNIEnv* env, 33 void OnData(JNIEnv* env,
35 jobject caller, 34 jobject caller,
36 jint endpoint_number, 35 jint endpoint_number,
37 jbyteArray data); 36 jbyteArray data);
38 37
39 static bool RegisterUsbMidiDevice(JNIEnv* env); 38 static bool RegisterUsbMidiDevice(JNIEnv* env);
40 39
41 private: 40 private:
42 // The actual device object. 41 // The actual device object.
43 base::android::ScopedJavaGlobalRef<jobject> raw_device_; 42 base::android::ScopedJavaGlobalRef<jobject> raw_device_;
44 UsbMidiDeviceDelegate* delegate_; 43 UsbMidiDeviceDelegate* delegate_;
45 44
46 DISALLOW_IMPLICIT_CONSTRUCTORS(UsbMidiDeviceAndroid); 45 DISALLOW_IMPLICIT_CONSTRUCTORS(UsbMidiDeviceAndroid);
47 }; 46 };
48 47
49 } // namespace media 48 } // namespace media
50 49
51 #endif // MEDIA_MIDI_USB_MIDI_DEVICE_ANDROID_H_ 50 #endif // MEDIA_MIDI_USB_MIDI_DEVICE_ANDROID_H_
OLDNEW
« no previous file with comments | « media/base/android/video_decoder_job.h ('k') | media/midi/usb_midi_device_factory_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698