Skip to content

Commit 22d8f22

Browse files
jkleinscjkleinsc
committed
2757472: Reland "Reland "[LSC] Remove base::string16 alias""
https://chromium-review.googlesource.com/c/chromium/src/+/2757472
1 parent 86d23ce commit 22d8f22

File tree

100 files changed

+417
-417
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+417
-417
lines changed

‎chromium_src/chrome/browser/certificate_manager_model.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ CertificateManagerModel::~CertificateManagerModel() = default;
9090
int CertificateManagerModel::ImportFromPKCS12(
9191
PK11SlotInfo* slot_info,
9292
const std::string& data,
93-
const base::string16& password,
93+
const std::u16string& password,
9494
bool is_extractable,
9595
net::ScopedCERTCertificateList* imported_certs) {
9696
return cert_db_->ImportFromPKCS12(slot_info, data, password, is_extractable,

‎chromium_src/chrome/browser/certificate_manager_model.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class CertificateManagerModel {
4646
// Returns a net error code on failure.
4747
int ImportFromPKCS12(PK11SlotInfo* slot_info,
4848
const std::string& data,
49-
const base::string16& password,
49+
const std::u16string& password,
5050
bool is_extractable,
5151
net::ScopedCERTCertificateList* imported_certs);
5252

‎shell/app/electron_content_client.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ ElectronContentClient::ElectronContentClient() = default;
161161

162162
ElectronContentClient::~ElectronContentClient() = default;
163163

164-
base::string16 ElectronContentClient::GetLocalizedString(int message_id) {
164+
std::u16string ElectronContentClient::GetLocalizedString(int message_id) {
165165
return l10n_util::GetStringUTF16(message_id);
166166
}
167167

‎shell/app/electron_content_client.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class ElectronContentClient : public content::ContentClient {
2121

2222
protected:
2323
// content::ContentClient:
24-
base::string16 GetLocalizedString(int message_id) override;
24+
std::u16string GetLocalizedString(int message_id) override;
2525
base::StringPiece GetDataResource(int resource_id, ui::ScaleFactor) override;
2626
gfx::Image& GetNativeImageNamed(int resource_id) override;
2727
base::RefCountedMemory* GetDataResourceBytes(int resource_id) override;

‎shell/browser/api/electron_api_app.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ void OnClientCertificateSelected(
549549
#if defined(USE_NSS_CERTS)
550550
int ImportIntoCertStore(CertificateManagerModel* model, base::Value options) {
551551
std::string file_data, cert_path;
552-
base::string16 password;
552+
std::u16string password;
553553
net::ScopedCERTCertificateList imported_certs;
554554
int rv = -1;
555555

‎shell/browser/api/electron_api_base_window.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,11 +1089,11 @@ bool BaseWindow::SetThumbnailToolTip(const std::string& tooltip) {
10891089
}
10901090

10911091
void BaseWindow::SetAppDetails(const gin_helper::Dictionary& options) {
1092-
base::string16 app_id;
1092+
std::u16string app_id;
10931093
base::FilePath app_icon_path;
10941094
int app_icon_index = 0;
1095-
base::string16 relaunch_command;
1096-
base::string16 relaunch_display_name;
1095+
std::u16string relaunch_command;
1096+
std::u16string relaunch_display_name;
10971097

10981098
options.Get("appId", &app_id);
10991099
options.Get("appIconPath", &app_icon_path);

‎shell/browser/api/electron_api_browser_window.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ void BrowserWindow::OnActivateContents() {
210210
#endif
211211
}
212212

213-
void BrowserWindow::OnPageTitleUpdated(const base::string16& title,
213+
void BrowserWindow::OnPageTitleUpdated(const std::u16string& title,
214214
bool explicit_set) {
215215
// Change window title to page title.
216216
auto self = GetWeakPtr();

‎shell/browser/api/electron_api_browser_window.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class BrowserWindow : public BaseWindow,
6262
const std::vector<mojom::DraggableRegionPtr>& regions) override;
6363
void OnSetContentBounds(const gfx::Rect& rect) override;
6464
void OnActivateContents() override;
65-
void OnPageTitleUpdated(const base::string16& title,
65+
void OnPageTitleUpdated(const std::u16string& title,
6666
bool explicit_set) override;
6767
#if defined(OS_MAC)
6868
void OnDevToolsResized() override;

‎shell/browser/api/electron_api_menu.cc‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ base::OnceClosure Menu::BindSelfToClosure(base::OnceClosure callback) {
163163

164164
void Menu::InsertItemAt(int index,
165165
int command_id,
166-
const base::string16& label) {
166+
const std::u16string& label) {
167167
model_->InsertItemAt(index, command_id, label);
168168
}
169169

@@ -173,20 +173,20 @@ void Menu::InsertSeparatorAt(int index) {
173173

174174
void Menu::InsertCheckItemAt(int index,
175175
int command_id,
176-
const base::string16& label) {
176+
const std::u16string& label) {
177177
model_->InsertCheckItemAt(index, command_id, label);
178178
}
179179

180180
void Menu::InsertRadioItemAt(int index,
181181
int command_id,
182-
const base::string16& label,
182+
const std::u16string& label,
183183
int group_id) {
184184
model_->InsertRadioItemAt(index, command_id, label, group_id);
185185
}
186186

187187
void Menu::InsertSubMenuAt(int index,
188188
int command_id,
189-
const base::string16& label,
189+
const std::u16string& label,
190190
Menu* menu) {
191191
menu->parent_ = this;
192192
model_->InsertSubMenuAt(index, command_id, label, menu->model_.get());
@@ -196,15 +196,15 @@ void Menu::SetIcon(int index, const gfx::Image& image) {
196196
model_->SetIcon(index, ui::ImageModel::FromImage(image));
197197
}
198198

199-
void Menu::SetSublabel(int index, const base::string16& sublabel) {
199+
void Menu::SetSublabel(int index, const std::u16string& sublabel) {
200200
model_->SetSecondaryLabel(index, sublabel);
201201
}
202202

203-
void Menu::SetToolTip(int index, const base::string16& toolTip) {
203+
void Menu::SetToolTip(int index, const std::u16string& toolTip) {
204204
model_->SetToolTip(index, toolTip);
205205
}
206206

207-
void Menu::SetRole(int index, const base::string16& role) {
207+
void Menu::SetRole(int index, const std::u16string& role) {
208208
model_->SetRole(index, role);
209209
}
210210

@@ -224,19 +224,19 @@ int Menu::GetCommandIdAt(int index) const {
224224
return model_->GetCommandIdAt(index);
225225
}
226226

227-
base::string16 Menu::GetLabelAt(int index) const {
227+
std::u16string Menu::GetLabelAt(int index) const {
228228
return model_->GetLabelAt(index);
229229
}
230230

231-
base::string16 Menu::GetSublabelAt(int index) const {
231+
std::u16string Menu::GetSublabelAt(int index) const {
232232
return model_->GetSecondaryLabelAt(index);
233233
}
234234

235-
base::string16 Menu::GetToolTipAt(int index) const {
235+
std::u16string Menu::GetToolTipAt(int index) const {
236236
return model_->GetToolTipAt(index);
237237
}
238238

239-
base::string16 Menu::GetAcceleratorTextAt(int index) const {
239+
std::u16string Menu::GetAcceleratorTextAt(int index) const {
240240
ui::Accelerator accelerator;
241241
model_->GetAcceleratorAtWithParams(index, true, &accelerator);
242242
return accelerator.GetShortcutText();

‎shell/browser/api/electron_api_menu.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -87,31 +87,31 @@ class Menu : public gin::Wrappable<Menu>,
8787
void OnMenuWillShow() override;
8888

8989
private:
90-
void InsertItemAt(int index, int command_id, const base::string16& label);
90+
void InsertItemAt(int index, int command_id, const std::u16string& label);
9191
void InsertSeparatorAt(int index);
9292
void InsertCheckItemAt(int index,
9393
int command_id,
94-
const base::string16& label);
94+
const std::u16string& label);
9595
void InsertRadioItemAt(int index,
9696
int command_id,
97-
const base::string16& label,
97+
const std::u16string& label,
9898
int group_id);
9999
void InsertSubMenuAt(int index,
100100
int command_id,
101-
const base::string16& label,
101+
const std::u16string& label,
102102
Menu* menu);
103103
void SetIcon(int index, const gfx::Image& image);
104-
void SetSublabel(int index, const base::string16& sublabel);
105-
void SetToolTip(int index, const base::string16& toolTip);
106-
void SetRole(int index, const base::string16& role);
104+
void SetSublabel(int index, const std::u16string& sublabel);
105+
void SetToolTip(int index, const std::u16string& toolTip);
106+
void SetRole(int index, const std::u16string& role);
107107
void Clear();
108108
int GetIndexOfCommandId(int command_id);
109109
int GetItemCount() const;
110110
int GetCommandIdAt(int index) const;
111-
base::string16 GetLabelAt(int index) const;
112-
base::string16 GetSublabelAt(int index) const;
113-
base::string16 GetToolTipAt(int index) const;
114-
base::string16 GetAcceleratorTextAt(int index) const;
111+
std::u16string GetLabelAt(int index) const;
112+
std::u16string GetSublabelAt(int index) const;
113+
std::u16string GetToolTipAt(int index) const;
114+
std::u16string GetAcceleratorTextAt(int index) const;
115115
bool IsItemCheckedAt(int index) const;
116116
bool IsEnabledAt(int index) const;
117117
bool IsVisibleAt(int index) const;

0 commit comments

Comments
 (0)