Chromium Code Reviews| Index: chrome/browser/media/desktop_capture_access_handler.cc |
| diff --git a/chrome/browser/media/desktop_capture_access_handler.cc b/chrome/browser/media/desktop_capture_access_handler.cc |
| index a9aa1bfb6be375e3ffa5c9aee2add8a5a6b20d5d..c1c36fbc2a891f2db39b13f86a4d1199d526b479 100644 |
| --- a/chrome/browser/media/desktop_capture_access_handler.cc |
| +++ b/chrome/browser/media/desktop_capture_access_handler.cc |
| @@ -367,9 +367,9 @@ void DesktopCaptureAccessHandler::HandleRequest( |
| media_id.type == content::DesktopMediaID::TYPE_WEB_CONTENTS; |
| const bool has_flag = base::CommandLine::ForCurrentProcess()->HasSwitch( |
|
Sergey Ulanov
2016/03/29 18:48:19
See my next comment first, but if you decide to ke
qiangchen
2016/03/29 20:10:44
Done.
I changed to check_audio_permission.
|
| - extensions::switches::kEnableDesktopCaptureAudio); |
| - const bool capture_audio = |
| - (has_flag ? audio_permitted : true) && audio_requested && audio_supported; |
| + extensions::switches::kDisableDesktopCaptureAudio); |
| + const bool capture_audio = (!has_flag ? audio_permitted : true) && |
|
Sergey Ulanov
2016/03/29 18:48:19
This looks weird. capture_audio may still be set t
qiangchen
2016/03/29 20:10:44
I found it weird also. Before my change, we do not
Sergey Ulanov
2016/03/30 19:34:22
Audio was supported for rather long time. See crb
|
| + audio_requested && audio_supported; |
| ui = GetDevicesForDesktopCapture(&devices, media_id, capture_audio, true, |
| GetApplicationTitle(web_contents, extension), |