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

6
renderer/api/atom_api_renderer_ipc.cc
View file

@ -48,7 +48,7 @@ v8::Handle<v8::Value> RendererIPC::Send(const v8::Arguments &args) {
if (!args[0]->IsString())
return node::ThrowTypeError("Bad argument");
string16 channel(V8ValueToUTF16(args[0]));
string16 channel = FromV8Value(args[0]);
RenderView* render_view = GetCurrentRenderView();
// Convert Arguments to Array, so we can use V8ValueConverter to convert it
@ -82,7 +82,7 @@ v8::Handle<v8::Value> RendererIPC::SendSync(const v8::Arguments &args) {
return node::ThrowTypeError("Bad argument");
v8::Handle<v8::Context> context = v8::Context::GetCurrent();
string16 channel(V8ValueToUTF16(args[0]));
string16 channel = FromV8Value(args[0]);
// Convert Arguments to Array, so we can use V8ValueConverter to convert it
// to ListValue.
@ -110,7 +110,7 @@ v8::Handle<v8::Value> RendererIPC::SendSync(const v8::Arguments &args) {
if (!success)
return node::ThrowError("Unable to send AtomViewHostMsg_Message_Sync");
return scope.Close(UTF16ToV8Value(json));
return scope.Close(ToV8Value(json));
}
// static

2
renderer/api/atom_renderer_bindings.cc
View file

@ -71,7 +71,7 @@ void AtomRendererBindings::OnBrowserMessage(const string16& channel,
std::vector<v8::Handle<v8::Value>> arguments;
arguments.reserve(1 + args.GetSize());
arguments.push_back(UTF16ToV8Value(channel));
arguments.push_back(ToV8Value(channel));
for (size_t i = 0; i < args.GetSize(); i++) {
const base::Value* value;