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

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

Issue 2558843002: Public Sessions - prompt the user for tabCapture requests (Closed)
Patch Set: Rebase Created 4 years 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/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 b856588c57c5f204bf70ad27bedd6f3f0a50313c..cf79263665dea1aae09a4f38e57a0804611c5675 100644
--- a/chrome/browser/media/webrtc/media_capture_devices_dispatcher.cc
+++ b/chrome/browser/media/webrtc/media_capture_devices_dispatcher.cc
@@ -37,6 +37,7 @@
#if defined(OS_CHROMEOS)
#include "ash/shell.h"
#include "chrome/browser/media/public_session_media_access_handler.h"
+#include "chrome/browser/media/webrtc/public_session_tab_capture_access_handler.h"
#endif // defined(OS_CHROMEOS)
#if BUILDFLAG(ENABLE_EXTENSIONS)
@@ -92,8 +93,13 @@ MediaCaptureDevicesDispatcher::MediaCaptureDevicesDispatcher()
media_access_handlers_.push_back(new ExtensionMediaAccessHandler());
#endif
media_access_handlers_.push_back(new DesktopCaptureAccessHandler());
+#if defined(OS_CHROMEOS)
+ // Wrapper around TabCaptureAccessHandler used in Public Sessions.
+ media_access_handlers_.push_back(new PublicSessionTabCaptureAccessHandler());
+#else
media_access_handlers_.push_back(new TabCaptureAccessHandler());
#endif
+#endif
media_access_handlers_.push_back(new PermissionBubbleMediaAccessHandler());
}

Powered by Google App Engine
This is Rietveld 408576698