Enable WebMIDI for Windows behind the flag

This CL implements media::MIDIManagerWin on top of Windows multimedia API to provide native MIDI support for web applications. BUG=303599 TEST=manually done on Windows 8.1 Review URL: https://codereview.chromium.org/29793006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238861 0039d316-1c4b-4281-b951-d872f2087c98
FairyWorld · Dec 5, 2013 · 3326530 · 3326530
1 parent 99f675d
commit 3326530
Show file tree

Hide file tree

Showing 5 changed files with 641 additions and 2 deletions.
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
@@ -1653,7 +1653,7 @@ const Experiment kExperiments[] = {
     "enable-web-midi",
     IDS_FLAGS_ENABLE_WEB_MIDI_NAME,
     IDS_FLAGS_ENABLE_WEB_MIDI_DESCRIPTION,
-    kOsMac,
+    kOsMac | kOsWin,
     SINGLE_VALUE_TYPE(switches::kEnableWebMIDI)
   },
   {

diff --git a/media/media.gyp b/media/media.gyp
@@ -409,6 +409,8 @@
         'midi/midi_message_queue.h',
         'midi/midi_message_util.cc',
         'midi/midi_message_util.h',
+        'midi/midi_manager_win.cc',
+        'midi/midi_manager_win.h',
         'midi/midi_port_info.cc',
         'midi/midi_port_info.h',
         'video/capture/android/video_capture_device_android.cc',

diff --git a/media/midi/midi_manager.cc b/media/midi/midi_manager.cc
@@ -9,7 +9,7 @@
 
 namespace media {
 
-#if !defined(OS_MACOSX)
+#if !defined(OS_MACOSX) && !defined(OS_WIN)
 // TODO(crogers): implement MIDIManager for other platforms.
 MIDIManager* MIDIManager::Create() {
   return NULL;