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

2757472: Reland "Reland "[LSC] Remove base::string16 alias""

Browse source 
2757472
This commit is contained in:
John Kleinschmidt 2021-03-18 15:55:51 -04:00
parent 3b183854ff
commit 2d3c65beca
31 changed files with 200 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

8
shell/app/electron_crash_reporter_client.cc
View file

@ -33,6 +33,10 @@
#include "base/debug/dump_without_crashing.h"
#endif
#if defined(OS_WIN)
#include "base/strings/string_util_win.h"
#endif
namespace {
ElectronCrashReporterClient* Instance() {
@ -130,8 +134,8 @@ void ElectronCrashReporterClient::GetProductNameAndVersion(
std::wstring* version,
std::wstring* special_build,
std::wstring* channel_name) {
*product_name = base::UTF8ToUTF16(ELECTRON_PRODUCT_NAME);
*version = base::UTF8ToUTF16(ELECTRON_VERSION_STRING);
*product_name = base::UTF8ToWide(ELECTRON_PRODUCT_NAME);
*version = base::UTF8ToWide(ELECTRON_VERSION_STRING);
}
#endif

2
shell/app/node_main.cc
View file

@ -66,7 +66,7 @@ void SetNodeCliFlags() {
for (const auto& arg : argv) {
#if defined(OS_WIN)
const auto& option = base::UTF16ToUTF8(arg);
const auto& option = base::WideToUTF8(arg);
#else
const auto& option = arg;
#endif