| Index: mojo/edk/system/async_waiter.h
|
| diff --git a/third_party/mojo/src/mojo/edk/system/async_waiter.h b/mojo/edk/system/async_waiter.h
|
| similarity index 70%
|
| copy from third_party/mojo/src/mojo/edk/system/async_waiter.h
|
| copy to mojo/edk/system/async_waiter.h
|
| index 3dd96ac450917398a3509a8361f66714d107be98..19ef5d6fee43cc2fa08d186f6da53c330b5f89f7 100644
|
| --- a/third_party/mojo/src/mojo/edk/system/async_waiter.h
|
| +++ b/mojo/edk/system/async_waiter.h
|
| @@ -2,17 +2,17 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_ASYNC_WAITER_H_
|
| -#define THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_ASYNC_WAITER_H_
|
| +#ifndef MOJO_EDK_SYSTEM_ASYNC_WAITER_H_
|
| +#define MOJO_EDK_SYSTEM_ASYNC_WAITER_H_
|
|
|
| #include "base/callback.h"
|
| +#include "mojo/edk/system/awakable.h"
|
| +#include "mojo/edk/system/system_impl_export.h"
|
| #include "mojo/public/c/system/types.h"
|
| #include "mojo/public/cpp/system/macros.h"
|
| -#include "third_party/mojo/src/mojo/edk/system/awakable.h"
|
| -#include "third_party/mojo/src/mojo/edk/system/system_impl_export.h"
|
|
|
| namespace mojo {
|
| -namespace system {
|
| +namespace edk {
|
|
|
| // An |Awakable| implementation that just calls a given callback object.
|
| class MOJO_SYSTEM_IMPL_EXPORT AsyncWaiter final : public Awakable {
|
| @@ -32,7 +32,7 @@ class MOJO_SYSTEM_IMPL_EXPORT AsyncWaiter final : public Awakable {
|
| MOJO_DISALLOW_COPY_AND_ASSIGN(AsyncWaiter);
|
| };
|
|
|
| -} // namespace system
|
| +} // namespace edk
|
| } // namespace mojo
|
|
|
| -#endif // THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_ASYNC_WAITER_H_
|
| +#endif // MOJO_EDK_SYSTEM_ASYNC_WAITER_H_
|
|
|