Fix string conversions

rogerwang · rogerwang · commit 1ac73b300ada · 2021-05-25T08:38:28.000-06:00
diff --git a/src/api/nw_app_api.cc b/src/api/nw_app_api.cc
@@ -173,7 +173,11 @@ bool NwAppGetArgvSyncFunction::RunNWSync(base::ListValue* response, std::string*
       continue;
     }
 
+#if defined(OS_WIN)
+    response->AppendString(base::WideToUTF16(argv[i]));
+#else
     response->AppendString(argv[i]);
+#endif
   }
   return true;
 }
@@ -261,7 +265,7 @@ bool NwAppSetProxyConfigFunction::RunNWSync(base::ListValue* response, std::stri
 }
 
 bool NwAppGetDataPathFunction::RunNWSync(base::ListValue* response, std::string* error) {
-  response->AppendString(browser_context()->GetPath().value());
+  response->AppendString(base::WideToUTF16(browser_context()->GetPath().value()));
   return true;
 }
 
diff --git a/src/api/nw_menu_api_mac.mm b/src/api/nw_menu_api_mac.mm
@@ -59,7 +59,7 @@ void InitMsgIDMap() {
 bool NwMenuGetNSStringFWithFixupFunction::RunNWSync(base::ListValue* response, std::string* error) {
   if (!g_msgid_inited) InitMsgIDMap();
   std::string msgstr;
-  base::string16 appName;
+  std::u16string appName;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &msgstr));
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(1, &appName));
   MsgIDMap::iterator it = g_msgid_map.find(msgstr);
diff --git a/src/api/nw_window_api.cc b/src/api/nw_window_api.cc
@@ -588,7 +588,7 @@ static base::win::ScopedHICON createBadgeIcon(const HWND hWnd, const TCHAR *valu
   const int fontSize = sizeY * 0.65f;
   gfx::Font font(platform_font->GetFontName(), fontSize);
   const int yMargin = (sizeY - fontSize) / 2;
-  canvas.DrawStringRectWithFlags(value, gfx::FontList(font), SK_ColorWHITE, gfx::Rect(sizeX, fontSize + yMargin + 1), gfx::Canvas::TEXT_ALIGN_CENTER);
+  canvas.DrawStringRectWithFlags(base::WideToUTF16(value), gfx::FontList(font), SK_ColorWHITE, gfx::Rect(sizeX, fontSize + yMargin + 1), gfx::Canvas::TEXT_ALIGN_CENTER);
 
   // return the canvas as windows native icon handle
   return IconUtil::CreateHICONFromSkBitmap(canvas.GetBitmap());
@@ -638,7 +638,7 @@ NwCurrentWindowInternalSetBadgeLabelInternalFunction::Run() {
   }
   const float scale = display::win::GetDPIScale();
   if (badge.size())
-    icon = createBadgeIcon(hWnd, base::UTF8ToUTF16(badge).c_str(), 16 * scale, 16 * scale);
+    icon = createBadgeIcon(hWnd, base::UTF8ToWide(badge).c_str(), 16 * scale, 16 * scale);
 
   taskbar->SetOverlayIcon(hWnd, icon.get(), L"Status");
 #elif defined(OS_LINUX)
diff --git a/src/browser/nw_chrome_browser_hooks.cc b/src/browser/nw_chrome_browser_hooks.cc
@@ -395,7 +395,7 @@ bool ProcessSingletonNotificationCallbackHook(const base::CommandLine& command_l
   package->root()->GetBoolean(switches::kmSingleInstance, &single_instance);
   if (single_instance) {
 #if defined(OS_WIN)
-    std::string cmd = base::UTF16ToUTF8(command_line.GetCommandLineString());
+    std::string cmd = base::WideToUTF8(command_line.GetCommandLineString());
 #else
     std::string cmd = command_line.GetCommandLineString();
 #endif
diff --git a/src/nw_custom_bindings.cc b/src/nw_custom_bindings.cc
@@ -245,7 +245,7 @@ void NWCustomBindings::EvalScript(
     web_frame = blink::WebFrame::FromCoreFrame(iframe->ContentFrame());
   }
 #if defined(OS_WIN)
-  std::u16string jscript((WCHAR*)*v8::String::Value(isolate, args[1]));
+  std::u16string jscript(base::WideToUTF16((WCHAR*)*v8::String::Value(isolate, args[1])));
 #else
   std::u16string jscript((char16_t*)*v8::String::Value(isolate, args[1]));
 #endif
diff --git a/src/nw_package.cc b/src/nw_package.cc
@@ -502,8 +502,8 @@ void Package::ReadChromiumArgs() {
     // string here is safe beacuse we use ASCII only.
     if (!base::IsSwitch(ASCIIToWide(chromium_args[i]), &key, &value))
       continue;
-    command_line->AppendSwitchASCII(base::UTF16ToASCII(key),
-                                    base::UTF16ToASCII(value));
+    command_line->AppendSwitchASCII(base::WideToASCII(key),
+                                    base::WideToASCII(value));
 #else
     if (!base::IsSwitch(chromium_args[i], &key, &value))
       continue;

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,11 @@ bool NwAppGetArgvSyncFunction::RunNWSync(base::ListValue* response, std::string*`
`173`	`173`	`continue;`
`174`	`174`	`}`
`175`	`175`
	`176`	`+#if defined(OS_WIN)`
	`177`	`+ response->AppendString(base::WideToUTF16(argv[i]));`
	`178`	`+#else`
`176`	`179`	`response->AppendString(argv[i]);`
	`180`	`+#endif`
`177`	`181`	`}`
`178`	`182`	`return true;`
`179`	`183`	`}`
`@@ -261,7 +265,7 @@ bool NwAppSetProxyConfigFunction::RunNWSync(base::ListValue* response, std::stri`
`261`	`265`	`}`
`262`	`266`
`263`	`267`	`bool NwAppGetDataPathFunction::RunNWSync(base::ListValue* response, std::string* error) {`
`264`		`- response->AppendString(browser_context()->GetPath().value());`
	`268`	`+ response->AppendString(base::WideToUTF16(browser_context()->GetPath().value()));`
`265`	`269`	`return true;`
`266`	`270`	`}`
`267`	`271`
Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ void NWCustomBindings::EvalScript(`
`245`	`245`	`web_frame = blink::WebFrame::FromCoreFrame(iframe->ContentFrame());`
`246`	`246`	`}`
`247`	`247`	`#if defined(OS_WIN)`
`248`		`- std::u16string jscript((WCHAR)v8::String::Value(isolate, args[1]));`
	`248`	`+ std::u16string jscript(base::WideToUTF16((WCHAR)v8::String::Value(isolate, args[1])));`
`249`	`249`	`#else`
`250`	`250`	`std::u16string jscript((char16_t)v8::String::Value(isolate, args[1]));`
`251`	`251`	`#endif`