From f1bb6be4b91f636a6a6298b7352823b01eb4c48b Mon Sep 17 00:00:00 2001 From: John Kleinschmidt Date: Tue, 16 Mar 2021 11:17:38 -0400 Subject: [PATCH] 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 --- patches/chromium/accelerator.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/chromium/accelerator.patch b/patches/chromium/accelerator.patch index d3caffd5f54f..593215e83ccf 100644 --- a/patches/chromium/accelerator.patch +++ b/patches/chromium/accelerator.patch @@ -10,7 +10,7 @@ This patch makes three changes to Accelerator::GetShortcutText to improve shortc 3. Ctrl-Shift-= should show as Ctrl-+ diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc -index 1a2a154b743cd4ecccf1be9971f36896e982dc6e..b5cec83c479dfa584f496f1f73a81e8b9f64d08c 100644 +index 1a2a154b743cd4ecccf1be9971f36896e982dc6e..f28a557ccc96c25fc4a93dca216e3184b88cbf8d 100644 --- a/ui/base/accelerators/accelerator.cc +++ b/ui/base/accelerators/accelerator.cc @@ -12,6 +12,7 @@ @@ -41,7 +41,7 @@ index 1a2a154b743cd4ecccf1be9971f36896e982dc6e..b5cec83c479dfa584f496f1f73a81e8b + UsLayoutKeyboardCodeToDomCode(key_code_), flags); + if (c != 0) { + shortcut = -+ static_cast( ++ static_cast( + base::ToUpperASCII(static_cast(c))); + } #if defined(OS_WIN)