| Index: mojo/edk/js/core.cc
|
| diff --git a/third_party/mojo/src/mojo/edk/js/core.cc b/mojo/edk/js/core.cc
|
| similarity index 97%
|
| copy from third_party/mojo/src/mojo/edk/js/core.cc
|
| copy to mojo/edk/js/core.cc
|
| index 58bb0e2ea586a1c7e0e7085809e2f69c5dbb9f63..ed592b4bd79e4187a1b2b850f9760b2fba71d36e 100644
|
| --- a/third_party/mojo/src/mojo/edk/js/core.cc
|
| +++ b/mojo/edk/js/core.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "third_party/mojo/src/mojo/edk/js/core.h"
|
| +#include "mojo/edk/js/core.h"
|
|
|
| #include "base/bind.h"
|
| #include "base/logging.h"
|
| @@ -16,11 +16,11 @@
|
| #include "gin/per_isolate_data.h"
|
| #include "gin/public/wrapper_info.h"
|
| #include "gin/wrappable.h"
|
| -#include "third_party/mojo/src/mojo/edk/js/drain_data.h"
|
| -#include "third_party/mojo/src/mojo/edk/js/handle.h"
|
| +#include "mojo/edk/js/drain_data.h"
|
| +#include "mojo/edk/js/handle.h"
|
|
|
| namespace mojo {
|
| -namespace js {
|
| +namespace edk {
|
|
|
| namespace {
|
|
|
| @@ -282,8 +282,8 @@ v8::Handle<v8::Value> DoDrainData(gin::Arguments* args,
|
| }
|
|
|
| bool IsHandle(gin::Arguments* args, v8::Handle<v8::Value> val) {
|
| - gin::Handle<mojo::js::HandleWrapper> ignore_handle;
|
| - return gin::Converter<gin::Handle<mojo::js::HandleWrapper>>::FromV8(
|
| + gin::Handle<mojo::edk::HandleWrapper> ignore_handle;
|
| + return gin::Converter<gin::Handle<mojo::edk::HandleWrapper>>::FromV8(
|
| args->isolate(), val, &ignore_handle);
|
| }
|
|
|
| @@ -375,5 +375,5 @@ v8::Local<v8::Value> Core::GetModule(v8::Isolate* isolate) {
|
| return templ->NewInstance();
|
| }
|
|
|
| -} // namespace js
|
| +} // namespace edk
|
| } // namespace mojo
|
|
|