Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(135)

Unified Diff: mojo/edk/js/handle.cc

Issue 1350023003: Add a Mojo EDK for Chrome that uses one OS pipe per message pipe. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more cleanup Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/edk/js/handle.cc
diff --git a/third_party/mojo/src/mojo/edk/js/handle.cc b/mojo/edk/js/handle.cc
similarity index 85%
copy from third_party/mojo/src/mojo/edk/js/handle.cc
copy to mojo/edk/js/handle.cc
index f669e9bb33e22c543bf2e44323eea73cd3e86d3b..c465f463449525fb2ba3ebcd57e1aa72bc890399 100644
--- a/third_party/mojo/src/mojo/edk/js/handle.cc
+++ b/mojo/edk/js/handle.cc
@@ -2,12 +2,12 @@
// 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/handle.h"
+#include "mojo/edk/js/handle.h"
-#include "third_party/mojo/src/mojo/edk/js/handle_close_observer.h"
+#include "mojo/edk/js/handle_close_observer.h"
namespace mojo {
-namespace js {
+namespace edk {
gin::WrapperInfo HandleWrapper::kWrapperInfo = { gin::kEmbedderNativeGin };
@@ -39,7 +39,7 @@ void HandleWrapper::NotifyCloseObservers() {
FOR_EACH_OBSERVER(HandleCloseObserver, close_observers_, OnWillCloseHandle());
}
-} // namespace js
+} // namespace edk
} // namespace mojo
namespace gin {
@@ -48,7 +48,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::js::HandleWrapper::Create(isolate, val.value()).ToV8();
+ return mojo::edk::HandleWrapper::Create(isolate, val.value()).ToV8();
}
bool Converter<mojo::Handle>::FromV8(v8::Isolate* isolate,
@@ -59,8 +59,8 @@ bool Converter<mojo::Handle>::FromV8(v8::Isolate* isolate,
return true;
}
- gin::Handle<mojo::js::HandleWrapper> handle;
- if (!Converter<gin::Handle<mojo::js::HandleWrapper> >::FromV8(
+ gin::Handle<mojo::edk::HandleWrapper> handle;
+ if (!Converter<gin::Handle<mojo::edk::HandleWrapper> >::FromV8(
isolate, val, &handle))
return false;

Powered by Google App Engine
This is Rietveld 408576698