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

Unified Diff: chrome/browser/media/media_capture_devices_dispatcher.cc

Issue 411983002: Fix force-qtkit flag on dev channel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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 side-by-side diff with in-line comments
Download patch
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
}
« no previous file with comments | « no previous file | media/video/capture/mac/avfoundation_glue.mm » ('j') | media/video/capture/mac/avfoundation_glue.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698