chore: bump chromium to 132.0.6820.0 (main) (#44544)
* chore: bump chromium in DEPS to 132.0.6817.0 * chore: update chromium patches * 5979290: Temoporarily disable crel on arm. |5979290
* 5981701: Include callback.h instead of callback_forward.h |5981701
* 5964918: [v8 code cache] Add a wpt_internal test demonstrating the code cache 304 problem |5964918
* 5969697: Add NetworkTrafficAnnotationTag to PreconnectManager |5969697
* chore: update remaining patches * chore: bump chromium in DEPS to 132.0.6818.0 * chore: update patches * 5983492: MPArch GuestView: Have executeScript target correct frame |5983492
* chore: bump chromium in DEPS to 132.0.6820.0 * chore: update patches * 5989717: Revert "win: Remove special check for 10.0.22621.2428 Win SDK version" |5989717
* 5968218: Send PDF Searchifier running state to browser to show UX elements. |5968218
* build: also update the MSVS_HASH for WOA --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org>
This commit is contained in:
parent
3090e40c09
commit
adbd25f699
72 changed files with 249 additions and 273 deletions
|
@ -10,7 +10,7 @@ This patch makes three changes to Accelerator::GetShortcutText to improve shortc
|
|||
3. Ctrl-Shift-= and Ctrl-Plus show up as such
|
||||
|
||||
diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
|
||||
index 91709fe9dece5baeca989c1b25d83342c0ac6ac6..ed1ff076b1db6b77d0684bae1931714bf575ebe8 100644
|
||||
index 95d4323f066cf3f06d62a37df93fa75da9ed06f3..1368b85cc37fbb92916986c89c7053add4aaa632 100644
|
||||
--- a/ui/base/accelerators/accelerator.cc
|
||||
+++ b/ui/base/accelerators/accelerator.cc
|
||||
@@ -12,6 +12,7 @@
|
||||
|
@ -19,8 +19,8 @@ index 91709fe9dece5baeca989c1b25d83342c0ac6ac6..ed1ff076b1db6b77d0684bae1931714b
|
|||
#include "base/strings/string_util.h"
|
||||
+#include "base/strings/stringprintf.h"
|
||||
#include "base/strings/utf_string_conversions.h"
|
||||
#include "base/types/cxx23_to_underlying.h"
|
||||
#include "build/build_config.h"
|
||||
#include "build/chromeos_buildflags.h"
|
||||
@@ -184,6 +185,11 @@ std::u16string Accelerator::GetShortcutText() const {
|
||||
#endif
|
||||
|
||||
|
@ -33,7 +33,7 @@ index 91709fe9dece5baeca989c1b25d83342c0ac6ac6..ed1ff076b1db6b77d0684bae1931714b
|
|||
#if BUILDFLAG(IS_WIN)
|
||||
// Our fallback is to try translate the key code to a regular character
|
||||
// unless it is one of digits (VK_0 to VK_9). Some keyboard
|
||||
@@ -207,6 +213,10 @@ std::u16string Accelerator::GetShortcutText() const {
|
||||
@@ -208,6 +214,10 @@ std::u16string Accelerator::GetShortcutText() const {
|
||||
shortcut +=
|
||||
static_cast<std::u16string::value_type>(base::ToUpperASCII(c));
|
||||
#endif
|
||||
|
@ -44,7 +44,7 @@ index 91709fe9dece5baeca989c1b25d83342c0ac6ac6..ed1ff076b1db6b77d0684bae1931714b
|
|||
}
|
||||
|
||||
#if BUILDFLAG(IS_MAC)
|
||||
@@ -391,7 +401,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
|
||||
@@ -392,7 +402,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
|
||||
const std::u16string& shortcut) const {
|
||||
std::u16string result = shortcut;
|
||||
|
||||
|
@ -53,7 +53,7 @@ index 91709fe9dece5baeca989c1b25d83342c0ac6ac6..ed1ff076b1db6b77d0684bae1931714b
|
|||
result = ApplyModifierToAcceleratorString(result, IDS_APP_SHIFT_KEY);
|
||||
|
||||
// Note that we use 'else-if' in order to avoid using Ctrl+Alt as a shortcut.
|
||||
@@ -399,7 +409,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
|
||||
@@ -400,7 +410,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
|
||||
// more information.
|
||||
if (IsCtrlDown())
|
||||
result = ApplyModifierToAcceleratorString(result, IDS_APP_CTRL_KEY);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue