From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- chromium/components/dbus/menu/menu_property_list.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'chromium/components/dbus') diff --git a/chromium/components/dbus/menu/menu_property_list.cc b/chromium/components/dbus/menu/menu_property_list.cc index f0ad8d3dd65..7939625d61b 100644 --- a/chromium/components/dbus/menu/menu_property_list.cc +++ b/chromium/components/dbus/menu/menu_property_list.cc @@ -16,6 +16,7 @@ #if defined(USE_X11) #include +#include "ui/base/ui_base_features.h" #include "ui/events/keycodes/keyboard_code_conversion_x.h" // nogncheck #endif @@ -56,10 +57,12 @@ MenuItemProperties ComputeMenuPropertiesForMenuItem(ui::MenuModel* menu, if (accelerator.IsCmdDown()) parts.push_back(DbusString("Super")); #if defined(USE_X11) - parts.push_back(DbusString(XKeysymToString( - XKeysymForWindowsKeyCode(accelerator.key_code(), false)))); - properties["shortcut"] = - MakeDbusVariant(MakeDbusArray(DbusArray(std::move(parts)))); + if (!features::IsUsingOzonePlatform()) { + parts.push_back(DbusString(XKeysymToString( + XKeysymForWindowsKeyCode(accelerator.key_code(), false)))); + properties["shortcut"] = MakeDbusVariant( + MakeDbusArray(DbusArray(std::move(parts)))); + } #else NOTIMPLEMENTED(); #endif -- cgit v1.2.1