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

Side by Side Diff: chrome/browser/media/media_capture_devices_dispatcher.cc

Issue 1815983003: Remove deprecated QTKit Video Capture Support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 8 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 | « chrome/browser/about_flags.cc ('k') | chrome/browser/media/webrtc_webcam_browsertest.cc » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/media/media_capture_devices_dispatcher.h" 5 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/metrics/field_trial.h" 9 #include "base/metrics/field_trial.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 75
76 MediaCaptureDevicesDispatcher* MediaCaptureDevicesDispatcher::GetInstance() { 76 MediaCaptureDevicesDispatcher* MediaCaptureDevicesDispatcher::GetInstance() {
77 return base::Singleton<MediaCaptureDevicesDispatcher>::get(); 77 return base::Singleton<MediaCaptureDevicesDispatcher>::get();
78 } 78 }
79 79
80 MediaCaptureDevicesDispatcher::MediaCaptureDevicesDispatcher() 80 MediaCaptureDevicesDispatcher::MediaCaptureDevicesDispatcher()
81 : is_device_enumeration_disabled_(false), 81 : is_device_enumeration_disabled_(false),
82 media_stream_capture_indicator_(new MediaStreamCaptureIndicator()) { 82 media_stream_capture_indicator_(new MediaStreamCaptureIndicator()) {
83 DCHECK_CURRENTLY_ON(BrowserThread::UI); 83 DCHECK_CURRENTLY_ON(BrowserThread::UI);
84 84
85 #if defined(OS_MACOSX)
86 // AVFoundation is used for video/audio device monitoring and video capture.
87 if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
88 switches::kForceQTKit)) {
89 base::CommandLine::ForCurrentProcess()->AppendSwitch(
90 switches::kEnableAVFoundation);
91 }
92 #endif
93
94 #if defined(ENABLE_EXTENSIONS) 85 #if defined(ENABLE_EXTENSIONS)
95 media_access_handlers_.push_back(new ExtensionMediaAccessHandler()); 86 media_access_handlers_.push_back(new ExtensionMediaAccessHandler());
96 media_access_handlers_.push_back(new DesktopCaptureAccessHandler()); 87 media_access_handlers_.push_back(new DesktopCaptureAccessHandler());
97 media_access_handlers_.push_back(new TabCaptureAccessHandler()); 88 media_access_handlers_.push_back(new TabCaptureAccessHandler());
98 #endif 89 #endif
99 media_access_handlers_.push_back(new PermissionBubbleMediaAccessHandler()); 90 media_access_handlers_.push_back(new PermissionBubbleMediaAccessHandler());
100 } 91 }
101 92
102 MediaCaptureDevicesDispatcher::~MediaCaptureDevicesDispatcher() {} 93 MediaCaptureDevicesDispatcher::~MediaCaptureDevicesDispatcher() {}
103 94
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 388
398 void MediaCaptureDevicesDispatcher::SetTestAudioCaptureDevices( 389 void MediaCaptureDevicesDispatcher::SetTestAudioCaptureDevices(
399 const MediaStreamDevices& devices) { 390 const MediaStreamDevices& devices) {
400 test_audio_devices_ = devices; 391 test_audio_devices_ = devices;
401 } 392 }
402 393
403 void MediaCaptureDevicesDispatcher::SetTestVideoCaptureDevices( 394 void MediaCaptureDevicesDispatcher::SetTestVideoCaptureDevices(
404 const MediaStreamDevices& devices) { 395 const MediaStreamDevices& devices) {
405 test_video_devices_ = devices; 396 test_video_devices_ = devices;
406 } 397 }
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/media/webrtc_webcam_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698