mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Rename string16 to base::string16.

Browse source
This commit is contained in:
Cheng Zhao 2014-06-28 19:36:57 +08:00
parent c713deb1e8
commit e0e1d45859
10 changed files with 40 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/api/atom_api_menu.cc
View file

@ -111,7 +111,7 @@ bool Menu::IsItemForCommandIdDynamic(int command_id) const {
command_id)->BooleanValue();
}
string16 Menu::GetLabelForCommandId(int command_id) const {
base::string16 Menu::GetLabelForCommandId(int command_id) const {
v8::Isolate* isolate = v8::Isolate::GetCurrent();
v8::Locker locker(isolate);
v8::HandleScope handle_scope(isolate);
@ -121,12 +121,12 @@ string16 Menu::GetLabelForCommandId(int command_id) const {
const_cast<Menu*>(this)->GetWrapper(isolate),
"getLabelForCommandId",
command_id);
string16 label;
base::string16 label;
mate::ConvertFromV8(node_isolate, result, &label);
return label;
}
string16 Menu::GetSublabelForCommandId(int command_id) const {
base::string16 Menu::GetSublabelForCommandId(int command_id) const {
v8::Isolate* isolate = v8::Isolate::GetCurrent();
v8::Locker locker(isolate);
v8::HandleScope handle_scope(isolate);
@ -136,7 +136,7 @@ string16 Menu::GetSublabelForCommandId(int command_id) const {
const_cast<Menu*>(this)->GetWrapper(isolate),
"getSubLabelForCommandId",
command_id);
string16 label;
base::string16 label;
mate::ConvertFromV8(isolate, result, &label);
return label;
}