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..f45f312a355e109cc0d2fdefb546c96a593dbd04 100644 |
| --- a/chrome/browser/media/webrtc/media_capture_devices_dispatcher.cc |
| +++ b/chrome/browser/media/webrtc/media_capture_devices_dispatcher.cc |
| @@ -40,6 +40,7 @@ |
| #if BUILDFLAG(ENABLE_EXTENSIONS) |
| #include "chrome/browser/media/extension_media_access_handler.h" |
| +#include "chrome/browser/media/public_session_media_access_handler.h" |
| #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 +85,10 @@ MediaCaptureDevicesDispatcher::MediaCaptureDevicesDispatcher() |
| DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| #if BUILDFLAG(ENABLE_EXTENSIONS) |
| - media_access_handlers_.push_back(new ExtensionMediaAccessHandler()); |
| + auto extension_media_access_handler = new ExtensionMediaAccessHandler(); |
| + media_access_handlers_.push_back( |
| + new PublicSessionMediaAccessHandler(*extension_media_access_handler)); |
|
Devlin
2016/11/30 19:02:48
Hmm... this is a little weird. I wonder if it wou
Sergey Ulanov
2016/12/01 01:21:28
I think this is a good suggestions. Also add ifdef
Ivan Šandrk
2016/12/01 17:32:05
Now I understand what Sergey originally meant with
|
| + media_access_handlers_.push_back(extension_media_access_handler); |
| media_access_handlers_.push_back(new DesktopCaptureAccessHandler()); |
| media_access_handlers_.push_back(new TabCaptureAccessHandler()); |
| #endif |