github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-02-14 00:55:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
https://chromium-review.googlesource.com/c/chromium/src/+/2757472
This commit is contained in:
John Kleinschmidt
2021-03-16 12:18:45 -04:00
parent 86d23cee40
commit 22d8f22cfb
100 changed files with 417 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chromium_src/chrome/browser/certificate_manager_model.cc
View File

@@ -90,7 +90,7 @@ CertificateManagerModel::~CertificateManagerModel() = default;
int CertificateManagerModel::ImportFromPKCS12(
PK11SlotInfo* slot_info,
const std::string& data,
const base::string16& password,
const std::u16string& password,
bool is_extractable,
net::ScopedCERTCertificateList* imported_certs) {
return cert_db_->ImportFromPKCS12(slot_info, data, password, is_extractable,

2
chromium_src/chrome/browser/certificate_manager_model.h
View File

@@ -46,7 +46,7 @@ class CertificateManagerModel {
// Returns a net error code on failure.
int ImportFromPKCS12(PK11SlotInfo* slot_info,
const std::string& data,
const base::string16& password,
const std::u16string& password,
bool is_extractable,
net::ScopedCERTCertificateList* imported_certs);