From e11c5a2fcc41c0d3f54caa6dabffdd0bf1a70542 Mon Sep 17 00:00:00 2001 From: shikhak Date: Wed, 17 Jan 2024 15:25:06 -0500 Subject: [PATCH 1/2] Update desktop_capture_access_handler.cc --- chrome/browser/media/webrtc/desktop_capture_access_handler.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/chrome/browser/media/webrtc/desktop_capture_access_handler.cc b/chrome/browser/media/webrtc/desktop_capture_access_handler.cc index f916661db38f0..c06b23167f913 100644 --- a/chrome/browser/media/webrtc/desktop_capture_access_handler.cc +++ b/chrome/browser/media/webrtc/desktop_capture_access_handler.cc @@ -95,7 +95,6 @@ std::u16string GetApplicationTitle(content::WebContents* web_contents, bool ShouldDisplayNotification(const extensions::Extension* extension) { return !(extension && (extension->location() == ManifestLocation::kComponent || - extension->is_nwjs_app() || extension->location() == ManifestLocation::kExternalComponent)); } @@ -177,7 +176,6 @@ bool IsRequestApproved(content::WebContents* web_contents, // Component extensions and some external extensions are approved by default. if (extension && (extension->location() == ManifestLocation::kComponent || - extension->is_nwjs_app() || extension->location() == ManifestLocation::kExternalComponent || is_allowlisted_extension)) { return true; From 26734143989a58d592a3f9de7edd9f88f9d704c8 Mon Sep 17 00:00:00 2001 From: shikhak Date: Wed, 17 Jan 2024 15:27:06 -0500 Subject: [PATCH 2/2] Update desktop_capture_devices_util.cc --- .../browser/media/webrtc/desktop_capture_devices_util.cc | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/chrome/browser/media/webrtc/desktop_capture_devices_util.cc b/chrome/browser/media/webrtc/desktop_capture_devices_util.cc index f991647acbd6b..91090cb2c51fb 100644 --- a/chrome/browser/media/webrtc/desktop_capture_devices_util.cc +++ b/chrome/browser/media/webrtc/desktop_capture_devices_util.cc @@ -142,7 +142,6 @@ DesktopMediaIDToDisplayMediaInformation( display_surface, logical_surface, cursor, std::move(capture_handle)); } -#if 0 std::u16string GetNotificationText(const std::u16string& application_title, bool capture_audio, content::DesktopMediaID::Type capture_type) { @@ -177,7 +176,6 @@ std::u16string GetNotificationText(const std::u16string& application_title, } return std::u16string(); } -#endif std::string DeviceNamePrefix( content::WebContents* web_contents, @@ -281,7 +279,6 @@ std::unique_ptr GetDevicesForDesktopCapture( media_id); } -#if 0 // If required, register to display the notification for stream capture. std::unique_ptr notification_ui; if (display_notification) { @@ -308,7 +305,5 @@ std::unique_ptr GetDevicesForDesktopCapture( ->GetMediaStreamCaptureIndicator() ->RegisterMediaStream(web_contents, out_devices, std::move(notification_ui), application_title); -#endif - std::unique_ptr ui; - return ui; + }