diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/components/dbus | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-c30a6232df03e1efbd9f3b226777b07e087a1122.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/dbus')
| -rw-r--r-- | chromium/components/dbus/menu/menu_property_list.cc | 11 |
1 files changed, 7 insertions, 4 deletions
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 <X11/Xlib.h> +#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<DbusString>(std::move(parts)))); + if (!features::IsUsingOzonePlatform()) { + parts.push_back(DbusString(XKeysymToString( + XKeysymForWindowsKeyCode(accelerator.key_code(), false)))); + properties["shortcut"] = MakeDbusVariant( + MakeDbusArray(DbusArray<DbusString>(std::move(parts)))); + } #else NOTIMPLEMENTED(); #endif |