github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-24 23:08:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix protocol module specs.

Browse Source
This commit is contained in:
Cheng Zhao
2013-12-15 16:53:07 +08:00
parent cfeeec37eb
commit 474e1fcd3b
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
browser/api/atom_api_protocol.cc
View File

@@ -188,7 +188,7 @@ void Protocol::RegisterProtocol(
return node::ThrowTypeError("Bad argument");
if (g_handlers.find(scheme) != g_handlers.end() ||
net::URLRequest::IsHandledProtocol(scheme))
GetRequestJobFactory()->IsHandledProtocol(scheme))
return node::ThrowError("The scheme is already registered");
if (AtomBrowserContext::Get()->url_request_context_getter() == NULL)
@@ -226,8 +226,11 @@ void Protocol::UnregisterProtocol(
// static
void Protocol::IsHandledProtocol(
const v8::FunctionCallbackInfo<v8::Value>& args) {
std::string scheme = FromV8Value(args[0]);
args.GetReturnValue().Set(net::URLRequest::IsHandledProtocol(scheme));
std::string scheme;
if (!FromV8Arguments(args, &scheme))
return node::ThrowTypeError("Bad argument");
args.GetReturnValue().Set(GetRequestJobFactory()->IsHandledProtocol(scheme));
}
// static
@@ -361,7 +364,7 @@ void Protocol::UninterceptProtocolInIO(const std::string& scheme) {
// static
void Protocol::Initialize(v8::Handle<v8::Object> target) {
// Remember the protocol object, used for emitting event later.
g_protocol_object.reset(v8::Object::New());
g_protocol_object.reset(target);
NODE_SET_METHOD(target, "registerProtocol", RegisterProtocol);
NODE_SET_METHOD(target, "unregisterProtocol", UnregisterProtocol);