Chromium Code Reviews| Index: chrome/browser/media/webrtc/media_capture_devices_dispatcher.cc |
| diff --git a/chrome/browser/media/webrtc/media_capture_devices_dispatcher.cc b/chrome/browser/media/webrtc/media_capture_devices_dispatcher.cc |
| index 197cbe28c72c6c6d21251e5fe4376744ca768021..7ce8be4d4b0126906e17d67e59799963ebfe1221 100644 |
| --- a/chrome/browser/media/webrtc/media_capture_devices_dispatcher.cc |
| +++ b/chrome/browser/media/webrtc/media_capture_devices_dispatcher.cc |
| @@ -40,6 +40,9 @@ |
| #if BUILDFLAG(ENABLE_EXTENSIONS) |
| #include "chrome/browser/media/extension_media_access_handler.h" |
| +#if defined(OS_CHROMEOS) |
| +#include "chrome/browser/media/public_session_media_access_handler.h" |
|
Devlin
2016/12/02 20:40:28
I *think* CrOS always implies extensions, so this
Ivan Šandrk
2016/12/05 13:10:51
Done.
|
| +#endif |
| #include "chrome/browser/media/webrtc/desktop_capture_access_handler.h" |
| #include "chrome/browser/media/webrtc/tab_capture_access_handler.h" |
| #include "extensions/browser/extension_registry.h" |
| @@ -84,7 +87,12 @@ MediaCaptureDevicesDispatcher::MediaCaptureDevicesDispatcher() |
| DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| #if BUILDFLAG(ENABLE_EXTENSIONS) |
| +#if defined(OS_CHROMEOS) |
| + // Wrapper around ExtensionMediaAccessHandler used in Public Sessions. |
| + media_access_handlers_.push_back(new PublicSessionMediaAccessHandler()); |
|
Sergey Ulanov
2016/12/02 20:29:47
Is it possible to check chromeos::LoginState::Get(
Andrew T Wilson (Slow)
2016/12/04 19:57:01
+1 to this - that would be my preference also.
Ivan Šandrk
2016/12/05 13:10:51
This piece of code is executed before first login
|
| +#else |
| media_access_handlers_.push_back(new ExtensionMediaAccessHandler()); |
| +#endif |
| media_access_handlers_.push_back(new DesktopCaptureAccessHandler()); |
| media_access_handlers_.push_back(new TabCaptureAccessHandler()); |
| #endif |