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

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

Issue 2418493002: //media/midi: use top level namespace midi rather than media.midi (Closed)
Patch Set: TAG name change s/media_midi/midi/ 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
« 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 <stdint.h> 9 #include <stdint.h>
10 #include <memory> 10 #include <memory>
11 #include <string> 11 #include <string>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/android/scoped_java_ref.h" 14 #include "base/android/scoped_java_ref.h"
15 #include "base/callback.h" 15 #include "base/callback.h"
16 #include "base/macros.h" 16 #include "base/macros.h"
17 #include "media/midi/usb_midi_device.h" 17 #include "media/midi/usb_midi_device.h"
18 #include "media/midi/usb_midi_export.h" 18 #include "media/midi/usb_midi_export.h"
19 19
20 namespace media {
21 namespace midi { 20 namespace midi {
22 21
23 class USB_MIDI_EXPORT UsbMidiDeviceAndroid : public UsbMidiDevice { 22 class USB_MIDI_EXPORT UsbMidiDeviceAndroid : public UsbMidiDevice {
24 public: 23 public:
25 static std::unique_ptr<Factory> CreateFactory(); 24 static std::unique_ptr<Factory> CreateFactory();
26 25
27 UsbMidiDeviceAndroid(const base::android::JavaRef<jobject>& raw_device, 26 UsbMidiDeviceAndroid(const base::android::JavaRef<jobject>& raw_device,
28 UsbMidiDeviceDelegate* delegate); 27 UsbMidiDeviceDelegate* delegate);
29 ~UsbMidiDeviceAndroid() override; 28 ~UsbMidiDeviceAndroid() override;
30 29
(...skipping 24 matching lines...) Expand all
55 54
56 std::vector<uint8_t> descriptors_; 55 std::vector<uint8_t> descriptors_;
57 std::string manufacturer_; 56 std::string manufacturer_;
58 std::string product_; 57 std::string product_;
59 std::string device_version_; 58 std::string device_version_;
60 59
61 DISALLOW_IMPLICIT_CONSTRUCTORS(UsbMidiDeviceAndroid); 60 DISALLOW_IMPLICIT_CONSTRUCTORS(UsbMidiDeviceAndroid);
62 }; 61 };
63 62
64 } // namespace midi 63 } // namespace midi
65 } // namespace media
66 64
67 #endif // MEDIA_MIDI_USB_MIDI_DEVICE_ANDROID_H_ 65 #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