Browse Source

chore: omit some unnecessary conversions

Charles Kerr 4 years ago
parent
commit
0f3620099a
2 changed files with 6 additions and 8 deletions
  1. 5 7
      shell/browser/api/electron_api_base_window.cc
  2. 1 1
      shell/browser/browser.h

+ 5 - 7
shell/browser/api/electron_api_base_window.cc

@@ -1089,11 +1089,11 @@ bool BaseWindow::SetThumbnailToolTip(const std::string& tooltip) {
 }
 
 void BaseWindow::SetAppDetails(const gin_helper::Dictionary& options) {
-  std::u16string app_id;
+  std::wstring app_id;
   base::FilePath app_icon_path;
   int app_icon_index = 0;
-  std::u16string relaunch_command;
-  std::u16string relaunch_display_name;
+  std::wstring relaunch_command;
+  std::wstring relaunch_display_name;
 
   options.Get("appId", &app_id);
   options.Get("appIconPath", &app_icon_path);
@@ -1101,10 +1101,8 @@ void BaseWindow::SetAppDetails(const gin_helper::Dictionary& options) {
   options.Get("relaunchCommand", &relaunch_command);
   options.Get("relaunchDisplayName", &relaunch_display_name);
 
-  ui::win::SetAppDetailsForWindow(base::UTF16ToWide(app_id), app_icon_path,
-                                  app_icon_index,
-                                  base::UTF16ToWide(relaunch_command),
-                                  base::UTF16ToWide(relaunch_display_name),
+  ui::win::SetAppDetailsForWindow(app_id, app_icon_path, app_icon_index,
+                                  relaunch_command, relaunch_display_name,
                                   window_->GetAcceleratedWidget());
 }
 #endif

+ 1 - 1
shell/browser/browser.h

@@ -137,7 +137,7 @@ class Browser : public WindowListObserver {
 #if defined(OS_WIN)
     // used in browser::setLoginItemSettings
     bool enabled = true;
-    std::wstring name = std::wstring();
+    std::wstring name;
 
     // used in browser::getLoginItemSettings
     bool executable_will_launch_at_login = false;