Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions chrome/browser/media/webrtc/desktop_capture_access_handler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down Expand Up @@ -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;
Expand Down
7 changes: 1 addition & 6 deletions chrome/browser/media/webrtc/desktop_capture_devices_util.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -177,7 +176,6 @@ std::u16string GetNotificationText(const std::u16string& application_title,
}
return std::u16string();
}
#endif

std::string DeviceNamePrefix(
content::WebContents* web_contents,
Expand Down Expand Up @@ -281,7 +279,6 @@ std::unique_ptr<content::MediaStreamUI> GetDevicesForDesktopCapture(
media_id);
}

#if 0
// If required, register to display the notification for stream capture.
std::unique_ptr<MediaStreamUI> notification_ui;
if (display_notification) {
Expand All @@ -308,7 +305,5 @@ std::unique_ptr<content::MediaStreamUI> GetDevicesForDesktopCapture(
->GetMediaStreamCaptureIndicator()
->RegisterMediaStream(web_contents, out_devices,
std::move(notification_ui), application_title);
#endif
std::unique_ptr<content::MediaStreamUI> ui;
return ui;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you need to keep the return ui, or if not let's keep "#if 0" so up stream merge is easier.

}