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

Side by Side Diff: media/midi/midi_manager_android.cc

Issue 2404443002: Web MIDI: use midi_service.mojom for media::midi::Result (Closed)
Patch Set: yhirano@ review 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
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 #include "media/midi/midi_manager_android.h" 5 #include "media/midi/midi_manager_android.h"
6 6
7 #include "base/android/build_info.h" 7 #include "base/android/build_info.h"
8 #include "base/android/context_utils.h" 8 #include "base/android/context_utils.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
11 #include "base/strings/stringprintf.h" 11 #include "base/strings/stringprintf.h"
12 #include "jni/MidiManagerAndroid_jni.h" 12 #include "jni/MidiManagerAndroid_jni.h"
13 #include "media/midi/midi_device_android.h" 13 #include "media/midi/midi_device_android.h"
14 #include "media/midi/midi_manager_usb.h" 14 #include "media/midi/midi_manager_usb.h"
15 #include "media/midi/midi_output_port_android.h" 15 #include "media/midi/midi_output_port_android.h"
16 #include "media/midi/midi_switches.h" 16 #include "media/midi/midi_switches.h"
17 #include "media/midi/usb_midi_device_factory_android.h" 17 #include "media/midi/usb_midi_device_factory_android.h"
18 18
19 using base::android::JavaParamRef; 19 using base::android::JavaParamRef;
20 using midi::mojom::Result;
20 21
21 namespace midi { 22 namespace midi {
22 23
23 MidiManager* MidiManager::Create() { 24 MidiManager* MidiManager::Create() {
24 auto sdk_version = base::android::BuildInfo::GetInstance()->sdk_int(); 25 auto sdk_version = base::android::BuildInfo::GetInstance()->sdk_int();
25 if (sdk_version <= base::android::SDK_VERSION_LOLLIPOP_MR1 || 26 if (sdk_version <= base::android::SDK_VERSION_LOLLIPOP_MR1 ||
26 !base::CommandLine::ForCurrentProcess()->HasSwitch( 27 !base::CommandLine::ForCurrentProcess()->HasSwitch(
27 switches::kUseAndroidMidiApi)) { 28 switches::kUseAndroidMidiApi)) {
28 return new MidiManagerUsb(std::unique_ptr<UsbMidiDevice::Factory>( 29 return new MidiManagerUsb(std::unique_ptr<UsbMidiDevice::Factory>(
29 new UsbMidiDeviceFactoryAndroid)); 30 new UsbMidiDeviceFactoryAndroid));
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 device->GetDeviceVersion(), MIDI_PORT_CONNECTED)); 180 device->GetDeviceVersion(), MIDI_PORT_CONNECTED));
180 } 181 }
181 devices_.push_back(device.release()); 182 devices_.push_back(device.release());
182 } 183 }
183 184
184 bool MidiManagerAndroid::Register(JNIEnv* env) { 185 bool MidiManagerAndroid::Register(JNIEnv* env) {
185 return RegisterNativesImpl(env); 186 return RegisterNativesImpl(env);
186 } 187 }
187 188
188 } // namespace midi 189 } // namespace midi
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698