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-15 21:21:27 -04:00
parent d4bec23bde
commit 9e336f5d0c
8 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
shell/common/gin_converters/blink_converter.cc
View file

@ -44,10 +44,10 @@ int VectorToBitArray(const std::vector<T>& vec) {
namespace gin {
template <>
struct Converter<base::char16> {
struct Converter<char16_t> {
static bool FromV8(v8::Isolate* isolate,
v8::Handle<v8::Value> val,
base::char16* out) {
char16_t* out) {
base::string16 code = base::UTF8ToUTF16(gin::V8ToString(isolate, val));
if (code.length() != 1)
return false;

2
shell/common/keyboard_util.cc
View file

@ -138,7 +138,7 @@ ui::KeyboardCode KeyboardCodeFromKeyIdentifier(const std::string& s,
} // namespace
ui::KeyboardCode KeyboardCodeFromCharCode(base::char16 c, bool* shifted) {
ui::KeyboardCode KeyboardCodeFromCharCode(char16_t c, bool* shifted) {
c = base::ToLowerASCII(c);
*shifted = false;
switch (c) {

2
shell/common/keyboard_util.h
View file

@ -14,7 +14,7 @@ namespace electron {
// Return key code of the char, and also determine whether the SHIFT key is
// pressed.
ui::KeyboardCode KeyboardCodeFromCharCode(base::char16 c, bool* shifted);
ui::KeyboardCode KeyboardCodeFromCharCode(char16_t c, bool* shifted);
// Return key code of the |str|, and also determine whether the SHIFT key is
// pressed.