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

Unified Diff: mojo/public/cpp/environment/lib/async_waiter.cc

Issue 703273002: Update mojo sdk to rev 04a510fb37db10642e156957f9b2c11c2f6442ac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix content/child -> mojo/common linking Created 6 years, 1 month 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
« no previous file with comments | « mojo/public/cpp/environment/async_waiter.h ('k') | mojo/public/cpp/environment/tests/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/cpp/environment/lib/async_waiter.cc
diff --git a/device/serial/async_waiter.cc b/mojo/public/cpp/environment/lib/async_waiter.cc
similarity index 60%
copy from device/serial/async_waiter.cc
copy to mojo/public/cpp/environment/lib/async_waiter.cc
index eb533fd2cecd5dfea735780148f82dcc309f36e0..599a6493424c84b304469a1f27d7ce18056d7f89 100644
--- a/device/serial/async_waiter.cc
+++ b/mojo/public/cpp/environment/lib/async_waiter.cc
@@ -2,21 +2,18 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "device/serial/async_waiter.h"
+#include "mojo/public/cpp/environment/async_waiter.h"
-namespace device {
+namespace mojo {
-AsyncWaiter::AsyncWaiter(mojo::Handle handle,
+AsyncWaiter::AsyncWaiter(Handle handle,
MojoHandleSignals signals,
const Callback& callback)
- : waiter_(mojo::Environment::GetDefaultAsyncWaiter()),
+ : waiter_(Environment::GetDefaultAsyncWaiter()),
id_(0),
callback_(callback) {
- id_ = waiter_->AsyncWait(handle.value(),
- signals,
- MOJO_DEADLINE_INDEFINITE,
- &AsyncWaiter::WaitComplete,
- this);
+ id_ = waiter_->AsyncWait(handle.value(), signals, MOJO_DEADLINE_INDEFINITE,
+ &AsyncWaiter::WaitComplete, this);
}
AsyncWaiter::~AsyncWaiter() {
@@ -34,4 +31,4 @@ void AsyncWaiter::WaitCompleteInternal(MojoResult result) {
callback_.Run(result);
}
-} // namespace device
+} // namespace mojo
« no previous file with comments | « mojo/public/cpp/environment/async_waiter.h ('k') | mojo/public/cpp/environment/tests/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698