| Index: mojo/edk/js/handle.cc
|
| diff --git a/mojo/edk/js/handle.cc b/mojo/edk/js/handle.cc
|
| index c465f463449525fb2ba3ebcd57e1aa72bc890399..9f9f1619cc7a6b0672600293aeda5e57bdede753 100644
|
| --- a/mojo/edk/js/handle.cc
|
| +++ b/mojo/edk/js/handle.cc
|
| @@ -8,6 +8,7 @@
|
|
|
| namespace mojo {
|
| namespace edk {
|
| +namespace js {
|
|
|
| gin::WrapperInfo HandleWrapper::kWrapperInfo = { gin::kEmbedderNativeGin };
|
|
|
| @@ -39,6 +40,7 @@ void HandleWrapper::NotifyCloseObservers() {
|
| FOR_EACH_OBSERVER(HandleCloseObserver, close_observers_, OnWillCloseHandle());
|
| }
|
|
|
| +} // namespace js
|
| } // namespace edk
|
| } // namespace mojo
|
|
|
| @@ -48,7 +50,7 @@ v8::Handle<v8::Value> Converter<mojo::Handle>::ToV8(v8::Isolate* isolate,
|
| const mojo::Handle& val) {
|
| if (!val.is_valid())
|
| return v8::Null(isolate);
|
| - return mojo::edk::HandleWrapper::Create(isolate, val.value()).ToV8();
|
| + return mojo::edk::js::HandleWrapper::Create(isolate, val.value()).ToV8();
|
| }
|
|
|
| bool Converter<mojo::Handle>::FromV8(v8::Isolate* isolate,
|
| @@ -59,9 +61,9 @@ bool Converter<mojo::Handle>::FromV8(v8::Isolate* isolate,
|
| return true;
|
| }
|
|
|
| - gin::Handle<mojo::edk::HandleWrapper> handle;
|
| - if (!Converter<gin::Handle<mojo::edk::HandleWrapper> >::FromV8(
|
| - isolate, val, &handle))
|
| + gin::Handle<mojo::edk::js::HandleWrapper> handle;
|
| + if (!Converter<gin::Handle<mojo::edk::js::HandleWrapper>>::FromV8(
|
| + isolate, val, &handle))
|
| return false;
|
|
|
| *out = handle->get();
|
| @@ -79,5 +81,4 @@ bool Converter<mojo::MessagePipeHandle>::FromV8(v8::Isolate* isolate,
|
| return Converter<mojo::Handle>::FromV8(isolate, val, out);
|
| }
|
|
|
| -
|
| } // namespace gin
|
|
|