chore: bump chromium to 145.0.7628.0 (main) (#49331)

* chore: bump chromium in DEPS to 145.0.7620.0 * chore: bump chromium in DEPS to 145.0.7622.0 * chore: bump chromium in DEPS to 145.0.7624.0 * chore: bump chromium in DEPS to 145.0.7626.0 * chore: bump chromium in DEPS to 145.0.7628.0 * 7362759: Migrate various base::Contains() to contains() in ui | https://chromium-review.googlesource.com/c/chromium/src/+/7362759 * chore: update patches * 7411324: url: Mark deprecated functions as UNSAFE_BUFFER_USAGE https://chromium-review.googlesource.com/c/chromium/src/+/7411324 * 7366867: Store property info in CSSParserLocalContext for random() https://chromium-review.googlesource.com/c/chromium/src/+/7366867 * 7277406: Exclude PiP from getDisplayMedia picker thumbnails https://chromium-review.googlesource.com/c/chromium/src/+/7277406 * 7253489: activity_reporter: Create stub module owned by browser_process https://chromium-review.googlesource.com/c/chromium/src/+/7253489 * 7404514: Create device parental controls delegate https://chromium-review.googlesource.com/c/chromium/src/+/7404514 * 7269504: Update histograms to use the updated MediaStreamRequestResult enum https://chromium-review.googlesource.com/c/chromium/src/+/7269504 * fixup! 7253489: activity_reporter: Create stub module owned by browser_process * 7368549: Reland "Use native rollup" https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/7368549 * 4803165: Enable suppressing input event dispatch while paint-holding. https://chromium-review.googlesource.com/c/chromium/src/+/4803165 * chore: make device_parental_controls lazy --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
2026-04-10 03:01:51 -04:00 · 2026-01-14 15:34:24 +01:00
parent dae76c2885
commit 5d80264944
63 changed files with 273 additions and 231 deletions
--- a/shell/browser/api/electron_api_desktop_capturer.cc
+++ b/shell/browser/api/electron_api_desktop_capturer.cc
@@ -147,7 +147,8 @@ base::flat_map<int32_t, uint32_t> MonitorAtomIdToDisplayId() {
 std::unique_ptr<ThumbnailCapturer> MakeWindowCapturer() {
 #if BUILDFLAG(IS_MAC)
  if (ShouldUseThumbnailCapturerMac(DesktopMediaList::Type::kWindow)) {
-    return CreateThumbnailCapturerMac(DesktopMediaList::Type::kWindow);
+    return CreateThumbnailCapturerMac(DesktopMediaList::Type::kWindow,
+                                      /*web_contents=*/nullptr);
  }
 #endif  // BUILDFLAG(IS_MAC)

@@ -162,7 +163,8 @@ std::unique_ptr<ThumbnailCapturer> MakeWindowCapturer() {
 std::unique_ptr<ThumbnailCapturer> MakeScreenCapturer() {
 #if BUILDFLAG(IS_MAC)
  if (ShouldUseThumbnailCapturerMac(DesktopMediaList::Type::kScreen)) {
-    return CreateThumbnailCapturerMac(DesktopMediaList::Type::kScreen);
+    return CreateThumbnailCapturerMac(DesktopMediaList::Type::kScreen,
+                                      /*web_contents=*/nullptr);
  }
 #endif  // BUILDFLAG(IS_MAC)

--- a/shell/browser/browser_process_impl.cc
+++ b/shell/browser/browser_process_impl.cc
@@ -27,6 +27,7 @@
 #include "components/proxy_config/pref_proxy_config_tracker_impl.h"
 #include "components/proxy_config/proxy_config_dictionary.h"
 #include "components/proxy_config/proxy_config_pref_names.h"
+#include "components/supervised_user/core/browser/device_parental_controls_noop_impl.h"  // nogncheck
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/network_quality_observer_factory.h"
 #include "content/public/browser/network_service_instance.h"
@@ -251,6 +252,18 @@ BrowserProcessImpl::background_printing_manager() {
  return nullptr;
 }

+supervised_user::DeviceParentalControls&
+BrowserProcessImpl::device_parental_controls() {
+  if (!device_parental_controls_)
+    device_parental_controls_ =
+        std::make_unique<supervised_user::DeviceParentalControlsNoOpImpl>();
+  return *device_parental_controls_;
+}
+
+activity_reporter::ActivityReporter* BrowserProcessImpl::activity_reporter() {
+  return nullptr;
+}
+
 IntranetRedirectDetector* BrowserProcessImpl::intranet_redirect_detector() {
  return nullptr;
 }
--- a/shell/browser/browser_process_impl.h
+++ b/shell/browser/browser_process_impl.h
@@ -102,7 +102,9 @@ class BrowserProcessImpl : public BrowserProcess {
  printing::PrintPreviewDialogController* print_preview_dialog_controller()
      override;
  printing::BackgroundPrintingManager* background_printing_manager() override;
+  activity_reporter::ActivityReporter* activity_reporter() override;
  IntranetRedirectDetector* intranet_redirect_detector() override;
+  supervised_user::DeviceParentalControls& device_parental_controls() override;
  DownloadStatusUpdater* download_status_updater() override;
  DownloadRequestLimiter* download_request_limiter() override;
  BackgroundModeManager* background_mode_manager() override;
@@ -162,6 +164,8 @@ class BrowserProcessImpl : public BrowserProcess {
  std::unique_ptr<
      network::NetworkQualityTracker::RTTAndThroughputEstimatesObserver>
      network_quality_observer_;
+  std::unique_ptr<supervised_user::DeviceParentalControls>
+      device_parental_controls_;

  std::unique_ptr<os_crypt_async::OSCryptAsync> os_crypt_async_;
 };
--- a/shell/browser/electron_browser_context.cc
+++ b/shell/browser/electron_browser_context.cc
@@ -685,9 +685,10 @@ void ElectronBrowserContext::DisplayMediaDeviceChosen(
      blink::mojom::StreamDevicesSet::New();
  v8::Local<v8::Value> result;
  if (!args->GetNext(&result) || result->IsNullOrUndefined()) {
-    std::move(callback).Run(
-        blink::mojom::StreamDevicesSet(),
-        blink::mojom::MediaStreamRequestResult::CAPTURE_FAILURE, nullptr);
+    std::move(callback).Run(blink::mojom::StreamDevicesSet(),
+                            blink::mojom::MediaStreamRequestResult::
+                                INVALID_DISPLAY_CAPTURE_CONSTRAINTS,
+                            nullptr);
    return;
  }
  gin_helper::Dictionary result_dict;
@@ -695,9 +696,10 @@ void ElectronBrowserContext::DisplayMediaDeviceChosen(
    args->ThrowTypeError(
        "Display Media Request streams callback must be called with null "
        "or a valid object");
-    std::move(callback).Run(
-        blink::mojom::StreamDevicesSet(),
-        blink::mojom::MediaStreamRequestResult::CAPTURE_FAILURE, nullptr);
+    std::move(callback).Run(blink::mojom::StreamDevicesSet(),
+                            blink::mojom::MediaStreamRequestResult::
+                                INVALID_DISPLAY_CAPTURE_CONSTRAINTS,
+                            nullptr);
    return;
  }
  stream_devices_set->stream_devices.emplace_back(
@@ -735,9 +737,10 @@ void ElectronBrowserContext::DisplayMediaDeviceChosen(
    } else {
      args->ThrowTypeError(
          "video must be a WebFrameMain or DesktopCapturerSource");
-      std::move(callback).Run(
-          blink::mojom::StreamDevicesSet(),
-          blink::mojom::MediaStreamRequestResult::CAPTURE_FAILURE, nullptr);
+      std::move(callback).Run(blink::mojom::StreamDevicesSet(),
+                              blink::mojom::MediaStreamRequestResult::
+                                  INVALID_DISPLAY_CAPTURE_CONSTRAINTS,
+                              nullptr);
      return;
    }
    has_video = true;
@@ -784,9 +787,10 @@ void ElectronBrowserContext::DisplayMediaDeviceChosen(
      args->ThrowTypeError(
          "audio must be a WebFrameMain, \"loopback\" or "
          "\"loopbackWithMute\"");
-      std::move(callback).Run(
-          blink::mojom::StreamDevicesSet(),
-          blink::mojom::MediaStreamRequestResult::CAPTURE_FAILURE, nullptr);
+      std::move(callback).Run(blink::mojom::StreamDevicesSet(),
+                              blink::mojom::MediaStreamRequestResult::
+                                  INVALID_DISPLAY_CAPTURE_CONSTRAINTS,
+                              nullptr);
      return;
    }
  }
@@ -794,9 +798,10 @@ void ElectronBrowserContext::DisplayMediaDeviceChosen(
  if ((video_requested && !has_video)) {
    args->ThrowTypeError(
        "Video was requested, but no video stream was provided");
-    std::move(callback).Run(
-        blink::mojom::StreamDevicesSet(),
-        blink::mojom::MediaStreamRequestResult::CAPTURE_FAILURE, nullptr);
+    std::move(callback).Run(blink::mojom::StreamDevicesSet(),
+                            blink::mojom::MediaStreamRequestResult::
+                                INVALID_DISPLAY_CAPTURE_CONSTRAINTS,
+                            nullptr);
    return;
  }

--- a/shell/browser/feature_list.cc
+++ b/shell/browser/feature_list.cc
@@ -62,7 +62,13 @@ void InitializeFeatureList() {
      // See https://chromium-review.googlesource.com/c/chromium/src/+/6910012
      // Needed until we rework some of our logic and checks to enable this
      // properly.
-      std::string(",") + network::features::kLocalNetworkAccessChecks.name;
+      std::string(",") + network::features::kLocalNetworkAccessChecks.name +
+      // See 4803165: Enable suppressing input event dispatch while
+      // paint-holding. Needed to prevent spurious input event handling
+      // failures.
+      // TODO(codebytere): Figure out how to properly wait for paint-hold.
+      std::string(",") +
+      blink::features::kDropInputEventsWhilePaintHolding.name;

 #if BUILDFLAG(IS_WIN)
  // Refs https://issues.chromium.org/issues/401996981