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

Unified Diff: media/midi/usb_midi_device_android.h

Issue 1534273002: Switch to standard integer types in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more Created 5 years 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 side-by-side diff with in-line comments
Download patch
Index: media/midi/usb_midi_device_android.h
diff --git a/media/midi/usb_midi_device_android.h b/media/midi/usb_midi_device_android.h
index 0583608991fa3e145a28370a15dce54a3316aa75..27d2389cf1db44c6d7c3cfdfc59a7e83d621dc1a 100644
--- a/media/midi/usb_midi_device_android.h
+++ b/media/midi/usb_midi_device_android.h
@@ -10,7 +10,6 @@
#include <vector>
#include "base/android/scoped_java_ref.h"
-#include "base/basictypes.h"
#include "base/callback.h"
#include "media/midi/usb_midi_device.h"
#include "media/midi/usb_midi_export.h"
@@ -27,11 +26,11 @@ class USB_MIDI_EXPORT UsbMidiDeviceAndroid : public UsbMidiDevice {
~UsbMidiDeviceAndroid() override;
// UsbMidiDevice implementation.
- std::vector<uint8> GetDescriptors() override;
+ std::vector<uint8_t> GetDescriptors() override;
std::string GetManufacturer() override;
std::string GetProductName() override;
std::string GetDeviceVersion() override;
- void Send(int endpoint_number, const std::vector<uint8>& data) override;
+ void Send(int endpoint_number, const std::vector<uint8_t>& data) override;
// Called by the Java world.
void OnData(JNIEnv* env,
@@ -44,14 +43,14 @@ class USB_MIDI_EXPORT UsbMidiDeviceAndroid : public UsbMidiDevice {
private:
void GetDescriptorsInternal();
void InitDeviceInfo();
- std::vector<uint8> GetStringDescriptor(int index);
+ std::vector<uint8_t> GetStringDescriptor(int index);
std::string GetString(int index, const std::string& backup);
// The actual device object.
base::android::ScopedJavaGlobalRef<jobject> raw_device_;
UsbMidiDeviceDelegate* delegate_;
- std::vector<uint8> descriptors_;
+ std::vector<uint8_t> descriptors_;
std::string manufacturer_;
std::string product_;
std::string device_version_;

Powered by Google App Engine
This is Rietveld 408576698