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

Unified Diff: mojo/edk/system/waiter.h

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/system/waiter.h
diff --git a/third_party/mojo/src/mojo/edk/system/waiter.h b/mojo/edk/system/waiter.h
similarity index 88%
copy from third_party/mojo/src/mojo/edk/system/waiter.h
copy to mojo/edk/system/waiter.h
index 9f9cc9c0cfd2e837a2a94f2753d70c88f9f85ed3..8e983ec11335c7700f62005e77bf46efa735ebea 100644
--- a/third_party/mojo/src/mojo/edk/system/waiter.h
+++ b/mojo/edk/system/waiter.h
@@ -2,20 +2,20 @@
// 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_WAITER_H_
-#define THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_WAITER_H_
+#ifndef MOJO_EDK_SYSTEM_WAITER_H_
+#define MOJO_EDK_SYSTEM_WAITER_H_
#include <stdint.h>
#include "base/synchronization/condition_variable.h"
#include "base/synchronization/lock.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 {
// IMPORTANT (all-caps gets your attention, right?): |Waiter| methods are called
// under other locks, in particular, |Dispatcher::lock_|s, so |Waiter| methods
@@ -73,7 +73,7 @@ class MOJO_SYSTEM_IMPL_EXPORT Waiter final : public Awakable {
MOJO_DISALLOW_COPY_AND_ASSIGN(Waiter);
};
-} // namespace system
+} // namespace edk
} // namespace mojo
-#endif // THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_WAITER_H_
+#endif // MOJO_EDK_SYSTEM_WAITER_H_

Powered by Google App Engine
This is Rietveld 408576698