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

Unified Diff: media/midi/midi_device_android.h

Issue 2895573002: Reland of Remove ScopedVector from all other codes in media/ (Closed)
Patch Set: Fix the compile fails in build target "jpeg_decode_accelerator_unittest" Created 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/gpu/video_encode_accelerator_unittest.cc ('k') | media/midi/midi_device_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/midi/midi_device_android.h
diff --git a/media/midi/midi_device_android.h b/media/midi/midi_device_android.h
index 34575cfbeaef2894370947a70ccd2ab60f4bf685..cb44c330eadd396d23a70761027bb5e1519687e8 100644
--- a/media/midi/midi_device_android.h
+++ b/media/midi/midi_device_android.h
@@ -6,10 +6,11 @@
#define MEDIA_MIDI_MIDI_DEVICE_ANDROID_H_
#include <jni.h>
+#include <memory>
#include <string>
+#include <vector>
#include "base/android/scoped_java_ref.h"
-#include "base/memory/scoped_vector.h"
#include "media/midi/midi_input_port_android.h"
namespace midi {
@@ -27,10 +28,12 @@ class MidiDeviceAndroid final {
std::string GetProductName();
std::string GetDeviceVersion();
- const ScopedVector<MidiInputPortAndroid>& input_ports() const {
+ const std::vector<std::unique_ptr<MidiInputPortAndroid>>& input_ports()
+ const {
return input_ports_;
}
- const ScopedVector<MidiOutputPortAndroid>& output_ports() const {
+ const std::vector<std::unique_ptr<MidiOutputPortAndroid>>& output_ports()
+ const {
return output_ports_;
}
bool HasRawDevice(JNIEnv* env, jobject raw_device) const {
@@ -39,8 +42,8 @@ class MidiDeviceAndroid final {
private:
base::android::ScopedJavaGlobalRef<jobject> raw_device_;
- ScopedVector<MidiInputPortAndroid> input_ports_;
- ScopedVector<MidiOutputPortAndroid> output_ports_;
+ std::vector<std::unique_ptr<MidiInputPortAndroid>> input_ports_;
+ std::vector<std::unique_ptr<MidiOutputPortAndroid>> output_ports_;
};
} // namespace midi
« no previous file with comments | « media/gpu/video_encode_accelerator_unittest.cc ('k') | media/midi/midi_device_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698