mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

2752406: [LSC] Replace base::string16 with std::u16string in //ui

Browse source 
2752406
This commit is contained in:
John Kleinschmidt 2021-03-16 11:17:38 -04:00
parent 2cd53eb46a
commit f1bb6be4b9
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
patches/chromium/accelerator.patch
View file

@ -10,7 +10,7 @@ This patch makes three changes to Accelerator::GetShortcutText to improve shortc
3. Ctrl-Shift-= should show as Ctrl-+ 3. Ctrl-Shift-= should show as Ctrl-+
diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc 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 --- a/ui/base/accelerators/accelerator.cc
+++ b/ui/base/accelerators/accelerator.cc +++ b/ui/base/accelerators/accelerator.cc
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
@ -41,7 +41,7 @@ index 1a2a154b743cd4ecccf1be9971f36896e982dc6e..b5cec83c479dfa584f496f1f73a81e8b
+ UsLayoutKeyboardCodeToDomCode(key_code_), flags); + UsLayoutKeyboardCodeToDomCode(key_code_), flags);
+ if (c != 0) { + if (c != 0) {
+ shortcut = + shortcut =
+ static_cast<base::string16::value_type>( + static_cast<std::u16string::value_type>(
+ base::ToUpperASCII(static_cast<char16_t>(c))); + base::ToUpperASCII(static_cast<char16_t>(c)));
+ } + }
#if defined(OS_WIN) #if defined(OS_WIN)