mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
58 lines
2.6 KiB
Diff
58 lines
2.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Tom Anderson <thomasanderson@chromium.org>
|
|
Date: Fri, 24 Jun 2022 22:27:07 +0000
|
|
Subject: Remove default window title
|
|
|
|
This is to prevent the enterprise startup dialog from having "Ozone X11"
|
|
in the titlebar. The intention is for the window to have no title [1]
|
|
|
|
[1] https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/ui/views/policy/enterprise_startup_dialog_view.cc;drc=855b63f8fe9115f8b38d4736a259f9a96f83fcc6;l=209
|
|
|
|
R=sky
|
|
|
|
Change-Id: Iecc200941ad36b6d9feb91e88791b3612e941ea6
|
|
Fixed: 1336343
|
|
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3722478
|
|
Reviewed-by: Scott Violet <sky@chromium.org>
|
|
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
|
|
Cr-Commit-Position: refs/heads/main@{#1017858}
|
|
|
|
diff --git a/ui/ozone/platform/x11/ozone_platform_x11.cc b/ui/ozone/platform/x11/ozone_platform_x11.cc
|
|
index e312287e4aca61b51a69c8413088f56f9f704b5e..06bb59fe5e855d0a339e738cf12c566afcf376ac 100644
|
|
--- a/ui/ozone/platform/x11/ozone_platform_x11.cc
|
|
+++ b/ui/ozone/platform/x11/ozone_platform_x11.cc
|
|
@@ -102,7 +102,6 @@ class OzonePlatformX11 : public OzonePlatform,
|
|
PlatformWindowInitProperties properties) override {
|
|
auto window = std::make_unique<X11Window>(delegate);
|
|
window->Initialize(std::move(properties));
|
|
- window->SetTitle(u"Ozone X11");
|
|
return std::move(window);
|
|
}
|
|
|
|
diff --git a/ui/ozone/platform/x11/x11_window.cc b/ui/ozone/platform/x11/x11_window.cc
|
|
index 15b5f6ff21d3fca9e06e95bae08d1b2c0d2e3b1c..0b002c3950c9d450f42212f5dc9c5ce1e7cff010 100644
|
|
--- a/ui/ozone/platform/x11/x11_window.cc
|
|
+++ b/ui/ozone/platform/x11/x11_window.cc
|
|
@@ -362,6 +362,8 @@ void X11Window::Initialize(PlatformWindowInitProperties properties) {
|
|
if (wm_role_name)
|
|
SetWindowRole(xwindow_, std::string(wm_role_name));
|
|
|
|
+ SetTitle(u"");
|
|
+
|
|
if (properties.remove_standard_frame) {
|
|
// Setting _GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED tells gnome-shell to not force
|
|
// fullscreen on the window when it matches the desktop size.
|
|
diff --git a/ui/ozone/platform/x11/x11_window.h b/ui/ozone/platform/x11/x11_window.h
|
|
index 0b4ccfed94123120d491d08a4c95a02624d9d0ef..147304843f2acc90cf534b8da7710541605fe880 100644
|
|
--- a/ui/ozone/platform/x11/x11_window.h
|
|
+++ b/ui/ozone/platform/x11/x11_window.h
|
|
@@ -363,7 +363,7 @@ class X11Window : public PlatformWindow,
|
|
// Was this window initialized with the override_redirect window attribute?
|
|
bool override_redirect_ = false;
|
|
|
|
- std::u16string window_title_;
|
|
+ absl::optional<std::u16string> window_title_;
|
|
|
|
// Whether the window is visible with respect to Aura.
|
|
bool window_mapped_in_client_ = false;
|