parent
3b183854ff
commit
2d3c65beca
31 changed files with 200 additions and 152 deletions
|
@ -1101,8 +1101,10 @@ void BaseWindow::SetAppDetails(const gin_helper::Dictionary& options) {
|
|||
options.Get("relaunchCommand", &relaunch_command);
|
||||
options.Get("relaunchDisplayName", &relaunch_display_name);
|
||||
|
||||
ui::win::SetAppDetailsForWindow(app_id, app_icon_path, app_icon_index,
|
||||
relaunch_command, 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),
|
||||
window_->GetAcceleratedWidget());
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -175,7 +175,7 @@ void Start(const std::string& submit_url,
|
|||
base::PathService::Get(DIR_USER_DATA, &user_data_dir);
|
||||
::crash_reporter::InitializeCrashpadWithEmbeddedHandler(
|
||||
process_type.empty(), process_type,
|
||||
base::UTF16ToUTF8(user_data_dir.value()), base::FilePath());
|
||||
base::WideToUTF8(user_data_dir.value()), base::FilePath());
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -418,7 +418,7 @@ bool IsDeviceNameValid(const std::u16string& device_name) {
|
|||
return printer_exists;
|
||||
#elif defined(OS_WIN)
|
||||
printing::ScopedPrinterHandle printer;
|
||||
return printer.OpenPrinterWithName(device_name.c_str());
|
||||
return printer.OpenPrinterWithName(base::UTF16ToWide(device_name).c_str());
|
||||
#endif
|
||||
return true;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue