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

Unified Diff: mojo/edk/js/waiting_callback.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, 3 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/waiting_callback.cc
diff --git a/third_party/mojo/src/mojo/edk/js/waiting_callback.cc b/mojo/edk/js/waiting_callback.cc
similarity index 93%
copy from third_party/mojo/src/mojo/edk/js/waiting_callback.cc
copy to mojo/edk/js/waiting_callback.cc
index 9f58ef5061a880e209da23abe8fb4a85e64fea92..0bc875dd1a912672077a050ef86ae7b1d73c6f1e 100644
--- a/third_party/mojo/src/mojo/edk/js/waiting_callback.cc
+++ b/mojo/edk/js/waiting_callback.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/waiting_callback.h"
+#include "mojo/edk/js/waiting_callback.h"
#include "base/bind.h"
#include "base/message_loop/message_loop.h"
@@ -10,7 +10,7 @@
#include "mojo/public/cpp/environment/environment.h"
namespace mojo {
-namespace js {
+namespace edk {
namespace {
@@ -31,8 +31,11 @@ gin::Handle<WaitingCallback> WaitingCallback::Create(
gin::Handle<WaitingCallback> waiting_callback = gin::CreateHandle(
isolate, new WaitingCallback(isolate, callback, handle_wrapper));
waiting_callback->wait_id_ = Environment::GetDefaultAsyncWaiter()->AsyncWait(
- 3, handle_wrapper->get().value(), signals, MOJO_DEADLINE_INDEFINITE,
- &WaitingCallback::CallOnHandleReady, waiting_callback.get());
+ handle_wrapper->get().value(),
+ signals,
+ MOJO_DEADLINE_INDEFINITE,
+ &WaitingCallback::CallOnHandleReady,
+ waiting_callback.get());
return waiting_callback;
}
@@ -108,5 +111,5 @@ void WaitingCallback::OnWillCloseHandle() {
MOJO_RESULT_INVALID_ARGUMENT));
}
-} // namespace js
+} // namespace edk
} // namespace mojo
« no previous file with comments | « mojo/edk/js/waiting_callback.h ('k') | mojo/edk/mojo_edk.gni » ('j') | mojo/edk/system/core.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698