Public Sessions - prompt the user for audioCapture/videoCapture requests

chrome/browser/media/webrtc/media_capture_devices_dispatcher.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 22 matching lines @@
 #include "extensions/common/constants.h"
 #include "extensions/features/features.h"
 #include "media/base/media_switches.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/shell.h"
 #endif  // defined(OS_CHROMEOS)
 
 #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 can just go in the block above
(line 38).

[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"
 #include "extensions/common/extension.h"
 #include "extensions/common/permissions/permissions_data.h"
 #endif
 
 using content::BrowserThread;
 using content::MediaCaptureDevices;
 using content::MediaStreamDevices;
@@ skipping 24 matching lines @@
 MediaCaptureDevicesDispatcher* MediaCaptureDevicesDispatcher::GetInstance() {
   return base::Singleton<MediaCaptureDevicesDispatcher>::get();
 }
 
 MediaCaptureDevicesDispatcher::MediaCaptureDevicesDispatcher()
     : is_device_enumeration_disabled_(false),
       media_stream_capture_indicator_(new MediaStreamCaptureIndicator()) {
   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()->IsPublicSessionUser() here
instead of in  PublicSessionMediaAccessHandler? I.e. can be still create
ExtensionMediaAccessHandler() for normal sessions?

[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 so we won't know whether the
user will actually use the Public Session. I can make the
PublicSessionMediaAccessHandler::SupportsStreamType function return true only in
Public Sessions, that way we can use both.

+#else
   media_access_handlers_.push_back(new ExtensionMediaAccessHandler());
+#endif
   media_access_handlers_.push_back(new DesktopCaptureAccessHandler());
   media_access_handlers_.push_back(new TabCaptureAccessHandler());
 #endif
   media_access_handlers_.push_back(new PermissionBubbleMediaAccessHandler());
 }
 
 MediaCaptureDevicesDispatcher::~MediaCaptureDevicesDispatcher() {}
 
 void MediaCaptureDevicesDispatcher::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
@@ skipping 336 matching lines @@
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   for (MediaAccessHandler* handler : media_access_handlers_) {
     if (handler->SupportsStreamType(stream_type, nullptr)) {
       ToCaptureAccessHandlerBase(handler)->UpdateCapturingLinkSecured(
           render_process_id, render_frame_id, page_request_id, is_secure);
       break;
     }
   }
 #endif
 }