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

Use same name convention in string16_conversions.

Browse source
This commit is contained in:
Cheng Zhao 2013-09-23 23:00:58 +08:00
parent 8fdd3b3044
commit a824c88352
9 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

2
browser/api/atom_api_browser_ipc.cc
View file

@ -26,7 +26,7 @@ v8::Handle<v8::Value> BrowserIPC::Send(const v8::Arguments &args) {
if (!args[0]->IsString() || !args[1]->IsNumber() || !args[2]->IsNumber())
return node::ThrowTypeError("Bad argument");
string16 channel(V8ValueToUTF16(args[0]));
string16 channel(FromV8Value(args[0]));
int process_id = args[1]->IntegerValue();
int routing_id = args[2]->IntegerValue();

2
browser/api/atom_api_event.cc
View file

@ -90,7 +90,7 @@ v8::Handle<v8::Value> Event::SendReply(const v8::Arguments& args) {
if (event->message_ == NULL)
return node::ThrowError("Can only send reply to synchronous events once");
string16 json = V8ValueToUTF16(args[0]);
string16 json = FromV8Value(args[0]);
AtomViewHostMsg_Message_Sync::WriteReplyParams(event->message_, json);
event->sender_->Send(event->message_);

40
browser/api/atom_api_menu.cc
View file

@ -4,9 +4,9 @@
#include "browser/api/atom_api_menu.h"
#include "browser/api/atom_api_window.h"
#include "browser/ui/accelerator_util.h"
#include "common/string16_conversions.h"
#include "common/v8_conversions.h"
#define UNWRAP_MEMNU_AND_CHECK \
Menu* self = ObjectWrap::Unwrap<Menu>(args.This()); \
@ -100,18 +100,18 @@ bool Menu::IsItemForCommandIdDynamic(int command_id) const {
string16 Menu::GetLabelForCommandId(int command_id) const {
v8::HandleScope scope;
return V8ValueToUTF16(CallDelegate(v8::False(),
handle(),
"getLabelForCommandId",
command_id));
return FromV8Value(CallDelegate(v8::False(),
handle(),
"getLabelForCommandId",
command_id));
}
string16 Menu::GetSublabelForCommandId(int command_id) const {
v8::HandleScope scope;
return V8ValueToUTF16(CallDelegate(v8::False(),
handle(),
"getSubLabelForCommandId",
command_id));
return FromV8Value(CallDelegate(v8::False(),
handle(),
"getSubLabelForCommandId",
command_id));
}
void Menu::ExecuteCommand(int command_id, int event_flags) {
@ -141,10 +141,10 @@ v8::Handle<v8::Value> Menu::InsertItem(const v8::Arguments &args) {
int index = args[0]->IntegerValue();
if (index < 0)
self->model_->AddItem(args[1]->IntegerValue(), V8ValueToUTF16(args[2]));
self->model_->AddItem(args[1]->IntegerValue(), FromV8Value(args[2]));
else
self->model_->InsertItemAt(
index, args[1]->IntegerValue(), V8ValueToUTF16(args[2]));
index, args[1]->IntegerValue(), FromV8Value(args[2]));
return v8::Undefined();
}
@ -160,9 +160,9 @@ v8::Handle<v8::Value> Menu::InsertCheckItem(const v8::Arguments &args) {
int command_id = args[1]->IntegerValue();
if (index < 0)
self->model_->AddCheckItem(command_id, V8ValueToUTF16(args[2]));
self->model_->AddCheckItem(command_id, FromV8Value(args[2]));
else
self->model_->InsertCheckItemAt(index, command_id, V8ValueToUTF16(args[2]));
self->model_->InsertCheckItemAt(index, command_id, FromV8Value(args[2]));
return v8::Undefined();
}
@ -182,10 +182,10 @@ v8::Handle<v8::Value> Menu::InsertRadioItem(const v8::Arguments &args) {
int group_id = args[3]->IntegerValue();
if (index < 0)
self->model_->AddRadioItem(command_id, V8ValueToUTF16(args[2]), group_id);
self->model_->AddRadioItem(command_id, FromV8Value(args[2]), group_id);
else
self->model_->InsertRadioItemAt(
index, command_id, V8ValueToUTF16(args[2]), group_id);
index, command_id, FromV8Value(args[2]), group_id);
return v8::Undefined();
}
@ -226,10 +226,10 @@ v8::Handle<v8::Value> Menu::InsertSubMenu(const v8::Arguments &args) {
if (index < 0)
self->model_->AddSubMenu(
command_id, V8ValueToUTF16(args[2]), submenu->model_.get());
command_id, FromV8Value(args[2]), submenu->model_.get());
else
self->model_->InsertSubMenuAt(
index, command_id, V8ValueToUTF16(args[2]), submenu->model_.get());
index, command_id, FromV8Value(args[2]), submenu->model_.get());
return v8::Undefined();
}
@ -253,7 +253,7 @@ v8::Handle<v8::Value> Menu::SetSublabel(const v8::Arguments &args) {
if (!args[0]->IsNumber() || !args[1]->IsString())
return node::ThrowTypeError("Bad argument");
self->model_->SetSublabel(args[0]->IntegerValue(), V8ValueToUTF16(args[1]));
self->model_->SetSublabel(args[0]->IntegerValue(), FromV8Value(args[1]));
return v8::Undefined();
}
@ -291,14 +291,14 @@ v8::Handle<v8::Value> Menu::GetCommandIdAt(const v8::Arguments &args) {
v8::Handle<v8::Value> Menu::GetLabelAt(const v8::Arguments &args) {
UNWRAP_MEMNU_AND_CHECK;
int index = args[0]->IntegerValue();
return UTF16ToV8Value(self->model_->GetLabelAt(index));
return ToV8Value(self->model_->GetLabelAt(index));
}
// static
v8::Handle<v8::Value> Menu::GetSublabelAt(const v8::Arguments &args) {
UNWRAP_MEMNU_AND_CHECK;
int index = args[0]->IntegerValue();
return UTF16ToV8Value(self->model_->GetSublabelAt(index));
return ToV8Value(self->model_->GetSublabelAt(index));
}
// static

2
browser/api/atom_api_window.cc
View file

@ -465,7 +465,7 @@ v8::Handle<v8::Value> Window::GetPageTitle(const v8::Arguments &args) {
string16 title = self->window_->GetWebContents()->GetTitle();
return UTF16ToV8Value(title);
return ToV8Value(title);
}
// static

4
browser/api/atom_browser_bindings.cc
View file

@ -55,7 +55,7 @@ void AtomBrowserBindings::OnRendererMessage(int process_id,
// process.emit(channel, 'message', process_id, routing_id);
std::vector<v8::Handle<v8::Value>> arguments;
arguments.reserve(3 + args.GetSize());
arguments.push_back(UTF16ToV8Value(channel));
arguments.push_back(ToV8Value(channel));
const base::Value* value;
if (args.Get(0, &value))
arguments.push_back(converter->ToV8Value(value, context));
@ -91,7 +91,7 @@ void AtomBrowserBindings::OnRendererMessageSync(
// process.emit(channel, 'sync-message', event, process_id, routing_id);
std::vector<v8::Handle<v8::Value>> arguments;
arguments.reserve(3 + args.GetSize());
arguments.push_back(UTF16ToV8Value(channel));
arguments.push_back(ToV8Value(channel));
const base::Value* value;
if (args.Get(0, &value))
arguments.push_back(converter->ToV8Value(value, context));