From 40d87be14ca44423282fb10278cb44497febc3e6 Mon Sep 17 00:00:00 2001 From: Jeremy Rose Date: Thu, 30 Nov 2023 14:54:13 -0800 Subject: [PATCH] fixup! 5052035: [X11] Change AtomCache from a singleton to owned by Connection --- shell/browser/ui/x/x_window_utils.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shell/browser/ui/x/x_window_utils.cc b/shell/browser/ui/x/x_window_utils.cc index 117b6c2a64..7289f23b2d 100644 --- a/shell/browser/ui/x/x_window_utils.cc +++ b/shell/browser/ui/x/x_window_utils.cc @@ -28,7 +28,8 @@ void SetWMSpecState(x11::Window window, bool enabled, x11::Atom state) { void SetWindowType(x11::Window window, const std::string& type) { std::string type_prefix = "_NET_WM_WINDOW_TYPE_"; - x11::Atom window_type = x11::GetAtom(type_prefix + base::ToUpperASCII(type)); + std::string window_type_str = type_prefix + base::ToUpperASCII(type); + x11::Atom window_type = x11::GetAtom(window_type_str.c_str()); auto* connection = x11::Connection::Get(); connection->SetProperty(window, x11::GetAtom("_NET_WM_WINDOW_TYPE"), x11::Atom::ATOM, window_type);