chore: bump chromium to 135.0.7027.0 (main) (#45677)
* chore: bump chromium in DEPS to 135.0.7021.0 * chore: bump chromium in DEPS to 135.0.7023.0 * chore: update patches * chore: gen-libc++-filenames.js * [Extensions] Add a BUILD.gn file for the chrome.system.display API. Refs6227347
* chore: bump chromium in DEPS to 135.0.7025.0 * fixup! [Extensions] Add a BUILD.gn file for the chrome.system.display API. * [DevTools] Add support for automatic workspace folders. Refs6275926
* Add UseCounter for potential PNA 2.0 breakage Refs6259197
* Remove references to NavigationEntry/Controller in Zoom code. Refs6258070
* chore: update patches * Allow DevTools to record UmaHistogramMediumTimes Refs6183713
* chore: update patches * [gpu] Remove unnecessary media_buildflags include Refs6286526
* chore: bump chromium in DEPS to 135.0.7027.0 * chore: update patches * Remove type alias Refs6280957
* [Refactor] Make ExtensionRegistrar a browser keyed service. Refs6285230
* Remove unused functions Refs6278736
* chore: IWYU --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
This commit is contained in:
parent
6248c2436a
commit
612da3ec47
78 changed files with 347 additions and 575 deletions
|
@ -15,10 +15,10 @@ short-circuit all the permissions checks in MSDC for now to allow us to
|
|||
unduplicate this code.
|
||||
|
||||
diff --git a/components/webrtc/media_stream_devices_controller.cc b/components/webrtc/media_stream_devices_controller.cc
|
||||
index 13929e4f6c1997a9071a2d1e3982a8c8feac84e4..a9719f72b9994537665c7f6a433ea8499b42122d 100644
|
||||
index 5f1ca23a16474281a0b00b25ff8fc61c9bf4541f..bcf00895b6eb7345481143ea9b7ef49fc84262b5 100644
|
||||
--- a/components/webrtc/media_stream_devices_controller.cc
|
||||
+++ b/components/webrtc/media_stream_devices_controller.cc
|
||||
@@ -57,7 +57,8 @@ bool PermissionIsRequested(blink::PermissionType permission,
|
||||
@@ -56,7 +56,8 @@ bool PermissionIsRequested(blink::PermissionType permission,
|
||||
void MediaStreamDevicesController::RequestPermissions(
|
||||
const content::MediaStreamRequest& request,
|
||||
MediaStreamDeviceEnumerator* enumerator,
|
||||
|
@ -28,7 +28,7 @@ index 13929e4f6c1997a9071a2d1e3982a8c8feac84e4..a9719f72b9994537665c7f6a433ea849
|
|||
content::RenderFrameHost* rfh = content::RenderFrameHost::FromID(
|
||||
request.render_process_id, request.render_frame_id);
|
||||
// The RFH may have been destroyed by the time the request is processed.
|
||||
@@ -92,7 +93,7 @@ void MediaStreamDevicesController::RequestPermissions(
|
||||
@@ -91,7 +92,7 @@ void MediaStreamDevicesController::RequestPermissions(
|
||||
std::move(callback)));
|
||||
|
||||
std::vector<blink::PermissionType> permission_types;
|
||||
|
@ -37,7 +37,7 @@ index 13929e4f6c1997a9071a2d1e3982a8c8feac84e4..a9719f72b9994537665c7f6a433ea849
|
|||
content::PermissionController* permission_controller =
|
||||
web_contents->GetBrowserContext()->GetPermissionController();
|
||||
|
||||
@@ -165,19 +166,26 @@ void MediaStreamDevicesController::RequestPermissions(
|
||||
@@ -164,19 +165,26 @@ void MediaStreamDevicesController::RequestPermissions(
|
||||
requested_audio_capture_device_ids;
|
||||
permission_request_description.requested_video_capture_device_ids =
|
||||
requested_video_capture_device_ids;
|
||||
|
@ -72,7 +72,7 @@ index 13929e4f6c1997a9071a2d1e3982a8c8feac84e4..a9719f72b9994537665c7f6a433ea849
|
|||
}
|
||||
|
||||
MediaStreamDevicesController::~MediaStreamDevicesController() {
|
||||
@@ -426,6 +434,7 @@ bool MediaStreamDevicesController::PermissionIsBlockedForReason(
|
||||
@@ -425,6 +433,7 @@ bool MediaStreamDevicesController::PermissionIsBlockedForReason(
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -80,7 +80,7 @@ index 13929e4f6c1997a9071a2d1e3982a8c8feac84e4..a9719f72b9994537665c7f6a433ea849
|
|||
// TODO(raymes): This function wouldn't be needed if
|
||||
// PermissionManager::RequestPermissions returned a denial reason.
|
||||
content::PermissionResult result =
|
||||
@@ -436,6 +445,7 @@ bool MediaStreamDevicesController::PermissionIsBlockedForReason(
|
||||
@@ -435,6 +444,7 @@ bool MediaStreamDevicesController::PermissionIsBlockedForReason(
|
||||
DCHECK_EQ(blink::mojom::PermissionStatus::DENIED, result.status);
|
||||
return true;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue