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

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

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/midi_manager_android.h ('k') | media/midi/midi_manager_mac.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 #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 20
21 namespace media {
22 namespace midi { 21 namespace midi {
23 22
24 MidiManager* MidiManager::Create() { 23 MidiManager* MidiManager::Create() {
25 auto sdk_version = base::android::BuildInfo::GetInstance()->sdk_int(); 24 auto sdk_version = base::android::BuildInfo::GetInstance()->sdk_int();
26 if (sdk_version <= base::android::SDK_VERSION_LOLLIPOP_MR1 || 25 if (sdk_version <= base::android::SDK_VERSION_LOLLIPOP_MR1 ||
27 !base::CommandLine::ForCurrentProcess()->HasSwitch( 26 !base::CommandLine::ForCurrentProcess()->HasSwitch(
28 switches::kUseAndroidMidiApi)) { 27 switches::kUseAndroidMidiApi)) {
29 return new MidiManagerUsb(std::unique_ptr<UsbMidiDevice::Factory>( 28 return new MidiManagerUsb(std::unique_ptr<UsbMidiDevice::Factory>(
30 new UsbMidiDeviceFactoryAndroid)); 29 new UsbMidiDeviceFactoryAndroid));
31 } 30 }
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 device->GetDeviceVersion(), MIDI_PORT_CONNECTED)); 179 device->GetDeviceVersion(), MIDI_PORT_CONNECTED));
181 } 180 }
182 devices_.push_back(device.release()); 181 devices_.push_back(device.release());
183 } 182 }
184 183
185 bool MidiManagerAndroid::Register(JNIEnv* env) { 184 bool MidiManagerAndroid::Register(JNIEnv* env) {
186 return RegisterNativesImpl(env); 185 return RegisterNativesImpl(env);
187 } 186 }
188 187
189 } // namespace midi 188 } // namespace midi
190 } // namespace media
OLDNEW
« no previous file with comments | « media/midi/midi_manager_android.h ('k') | media/midi/midi_manager_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698