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 2000d3fb054ec22186f2ba2d27bf0ef6655f5e24..72f6f2449c9af91fd1d921f47537798b6ea9fa5c 100644 |
--- a/chrome/browser/media/media_capture_devices_dispatcher.cc |
+++ b/chrome/browser/media/media_capture_devices_dispatcher.cc |
@@ -276,13 +276,15 @@ MediaCaptureDevicesDispatcher::MediaCaptureDevicesDispatcher() |
content::NotificationService::AllSources()); |
// AVFoundation is used for video/audio device monitoring and video capture in |
- // Mac. Experimentally, connect it in Canary and Unkown (developer builds). |
+ // Mac. Experimentally, connect it in Canary and Unknown (developer builds). |
#if defined(OS_MACOSX) |
chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); |
- if (channel == chrome::VersionInfo::CHANNEL_CANARY || |
- channel == chrome::VersionInfo::CHANNEL_UNKNOWN) { |
- CommandLine::ForCurrentProcess()->AppendSwitch( |
- switches::kEnableAVFoundation); |
+ if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kForceQTKit)) { |
+ if (channel == chrome::VersionInfo::CHANNEL_CANARY || |
+ channel == chrome::VersionInfo::CHANNEL_UNKNOWN) { |
+ CommandLine::ForCurrentProcess()->AppendSwitch( |
+ switches::kEnableAVFoundation); |
+ } |
} |
#endif |
} |