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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h" 5 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/metrics/field_trial.h" 9 #include "base/metrics/field_trial.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 19 matching lines...) Expand all
30 #include "content/public/browser/render_process_host.h" 30 #include "content/public/browser/render_process_host.h"
31 #include "content/public/browser/web_contents.h" 31 #include "content/public/browser/web_contents.h"
32 #include "content/public/common/media_stream_request.h" 32 #include "content/public/common/media_stream_request.h"
33 #include "extensions/common/constants.h" 33 #include "extensions/common/constants.h"
34 #include "extensions/features/features.h" 34 #include "extensions/features/features.h"
35 #include "media/base/media_switches.h" 35 #include "media/base/media_switches.h"
36 36
37 #if defined(OS_CHROMEOS) 37 #if defined(OS_CHROMEOS)
38 #include "ash/shell.h" 38 #include "ash/shell.h"
39 #include "chrome/browser/media/public_session_media_access_handler.h" 39 #include "chrome/browser/media/public_session_media_access_handler.h"
40 #include "chrome/browser/media/webrtc/public_session_tab_capture_access_handler. h"
40 #endif // defined(OS_CHROMEOS) 41 #endif // defined(OS_CHROMEOS)
41 42
42 #if BUILDFLAG(ENABLE_EXTENSIONS) 43 #if BUILDFLAG(ENABLE_EXTENSIONS)
43 #include "chrome/browser/media/extension_media_access_handler.h" 44 #include "chrome/browser/media/extension_media_access_handler.h"
44 #include "chrome/browser/media/webrtc/desktop_capture_access_handler.h" 45 #include "chrome/browser/media/webrtc/desktop_capture_access_handler.h"
45 #include "chrome/browser/media/webrtc/tab_capture_access_handler.h" 46 #include "chrome/browser/media/webrtc/tab_capture_access_handler.h"
46 #include "extensions/browser/extension_registry.h" 47 #include "extensions/browser/extension_registry.h"
47 #include "extensions/common/extension.h" 48 #include "extensions/common/extension.h"
48 #include "extensions/common/permissions/permissions_data.h" 49 #include "extensions/common/permissions/permissions_data.h"
49 #endif 50 #endif
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 DCHECK_CURRENTLY_ON(BrowserThread::UI); 86 DCHECK_CURRENTLY_ON(BrowserThread::UI);
86 87
87 #if BUILDFLAG(ENABLE_EXTENSIONS) 88 #if BUILDFLAG(ENABLE_EXTENSIONS)
88 #if defined(OS_CHROMEOS) 89 #if defined(OS_CHROMEOS)
89 // Wrapper around ExtensionMediaAccessHandler used in Public Sessions. 90 // Wrapper around ExtensionMediaAccessHandler used in Public Sessions.
90 media_access_handlers_.push_back(new PublicSessionMediaAccessHandler()); 91 media_access_handlers_.push_back(new PublicSessionMediaAccessHandler());
91 #else 92 #else
92 media_access_handlers_.push_back(new ExtensionMediaAccessHandler()); 93 media_access_handlers_.push_back(new ExtensionMediaAccessHandler());
93 #endif 94 #endif
94 media_access_handlers_.push_back(new DesktopCaptureAccessHandler()); 95 media_access_handlers_.push_back(new DesktopCaptureAccessHandler());
96 #if defined(OS_CHROMEOS)
97 // Wrapper around TabCaptureAccessHandler used in Public Sessions.
98 media_access_handlers_.push_back(new PublicSessionTabCaptureAccessHandler());
99 #else
95 media_access_handlers_.push_back(new TabCaptureAccessHandler()); 100 media_access_handlers_.push_back(new TabCaptureAccessHandler());
96 #endif 101 #endif
102 #endif
97 media_access_handlers_.push_back(new PermissionBubbleMediaAccessHandler()); 103 media_access_handlers_.push_back(new PermissionBubbleMediaAccessHandler());
98 } 104 }
99 105
100 MediaCaptureDevicesDispatcher::~MediaCaptureDevicesDispatcher() {} 106 MediaCaptureDevicesDispatcher::~MediaCaptureDevicesDispatcher() {}
101 107
102 void MediaCaptureDevicesDispatcher::RegisterProfilePrefs( 108 void MediaCaptureDevicesDispatcher::RegisterProfilePrefs(
103 user_prefs::PrefRegistrySyncable* registry) { 109 user_prefs::PrefRegistrySyncable* registry) {
104 registry->RegisterStringPref(prefs::kDefaultAudioCaptureDevice, 110 registry->RegisterStringPref(prefs::kDefaultAudioCaptureDevice,
105 std::string()); 111 std::string());
106 registry->RegisterStringPref(prefs::kDefaultVideoCaptureDevice, 112 registry->RegisterStringPref(prefs::kDefaultVideoCaptureDevice,
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 #if BUILDFLAG(ENABLE_EXTENSIONS) 446 #if BUILDFLAG(ENABLE_EXTENSIONS)
441 for (MediaAccessHandler* handler : media_access_handlers_) { 447 for (MediaAccessHandler* handler : media_access_handlers_) {
442 if (handler->SupportsStreamType(stream_type, nullptr)) { 448 if (handler->SupportsStreamType(stream_type, nullptr)) {
443 ToCaptureAccessHandlerBase(handler)->UpdateCapturingLinkSecured( 449 ToCaptureAccessHandlerBase(handler)->UpdateCapturingLinkSecured(
444 render_process_id, render_frame_id, page_request_id, is_secure); 450 render_process_id, render_frame_id, page_request_id, is_secure);
445 break; 451 break;
446 } 452 }
447 } 453 }
448 #endif 454 #endif
449 } 455 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698