Index: chrome/browser/media/media_capture_devices_dispatcher.cc |
diff --git a/chrome/browser/media/media_capture_devices_dispatcher.cc b/chrome/browser/media/media_capture_devices_dispatcher.cc |
index 72f6f2449c9af91fd1d921f47537798b6ea9fa5c..30d3d75907ca135ef6cfd8cdabc637ed10793d2f 100644 |
--- a/chrome/browser/media/media_capture_devices_dispatcher.cc |
+++ b/chrome/browser/media/media_capture_devices_dispatcher.cc |
@@ -274,19 +274,6 @@ MediaCaptureDevicesDispatcher::MediaCaptureDevicesDispatcher() |
notifications_registrar_.Add( |
this, content::NOTIFICATION_WEB_CONTENTS_DESTROYED, |
content::NotificationService::AllSources()); |
- |
- // AVFoundation is used for video/audio device monitoring and video capture in |
- // Mac. Experimentally, connect it in Canary and Unknown (developer builds). |
-#if defined(OS_MACOSX) |
andresp-chromium
2014/08/06 06:50:33
I wonder why this was here and not controlled by t
vrk (LEFT CHROMIUM)
2014/08/07 01:25:00
Acknowledged.
|
- chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); |
- if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kForceQTKit)) { |
- if (channel == chrome::VersionInfo::CHANNEL_CANARY || |
- channel == chrome::VersionInfo::CHANNEL_UNKNOWN) { |
- CommandLine::ForCurrentProcess()->AppendSwitch( |
- switches::kEnableAVFoundation); |
- } |
- } |
-#endif |
} |
MediaCaptureDevicesDispatcher::~MediaCaptureDevicesDispatcher() {} |