mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
5d80264944
* 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>
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: clavin <clavin@electronjs.org>
|
|
Date: Sat, 13 Dec 2025 15:30:46 -0800
|
|
Subject: expose GTK UI platform field
|
|
|
|
Chromium used to expose this as a public static method, backed by global storage. In 7237910, these conveniences were removed.
|
|
|
|
This patch should be proposed upstream.
|
|
|
|
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7237910 "7237910: Remove g_gtk_ui global"
|
|
|
|
diff --git a/extensions/renderer/script_injection.cc b/extensions/renderer/script_injection.cc
|
|
index 71eaed03a15ba2ab5bae874daecfb0e95ac7c64d..12915abc0ba658b87b3a867e308f1b81cad61a17 100644
|
|
--- a/extensions/renderer/script_injection.cc
|
|
+++ b/extensions/renderer/script_injection.cc
|
|
@@ -9,6 +9,7 @@
|
|
|
|
#include "base/feature_list.h"
|
|
#include "base/functional/bind.h"
|
|
+#include "base/functional/callback_helpers.h"
|
|
#include "base/lazy_instance.h"
|
|
#include "base/memory/raw_ptr.h"
|
|
#include "base/metrics/histogram_macros.h"
|
|
diff --git a/ui/gtk/gtk_ui.h b/ui/gtk/gtk_ui.h
|
|
index 40caafa5ce58104da7d5e96eb1efad1c99a77664..b388fc462e0c320170e5b35550e48b6b19079f40 100644
|
|
--- a/ui/gtk/gtk_ui.h
|
|
+++ b/ui/gtk/gtk_ui.h
|
|
@@ -53,6 +53,8 @@ class GtkUi : public ui::LinuxUiAndTheme {
|
|
|
|
~GtkUi() override;
|
|
|
|
+ GtkUiPlatform* GetPlatform() const { return platform_.get(); }
|
|
+
|
|
// Setters used by SettingsProvider:
|
|
void SetWindowButtonOrdering(
|
|
const std::vector<views::FrameButton>& leading_buttons,
|