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

Unified Diff: mojo/public/cpp/system/macros.h

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 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/system/handle.h ('k') | mojo/public/cpp/system/message_pipe.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/cpp/system/macros.h
diff --git a/third_party/mojo/src/mojo/public/cpp/system/macros.h b/mojo/public/cpp/system/macros.h
similarity index 87%
rename from third_party/mojo/src/mojo/public/cpp/system/macros.h
rename to mojo/public/cpp/system/macros.h
index 3fc51cff38ebbc71e23dd310cc6b68af99bafb39..7f0fcd7751f60a1709f14872a35e51f5fc63b120 100644
--- a/third_party/mojo/src/mojo/public/cpp/system/macros.h
+++ b/mojo/public/cpp/system/macros.h
@@ -3,13 +3,13 @@
// found in the LICENSE file.
// Define a set of C++ specific macros.
-// Mojo C++ API users can assume that third_party/mojo/src/mojo/public/cpp/system/macros.h
-// includes third_party/mojo/src/mojo/public/c/system/macros.h.
+// Mojo C++ API users can assume that mojo/public/cpp/system/macros.h
+// includes mojo/public/c/system/macros.h.
-#ifndef THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_SYSTEM_MACROS_H_
-#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_SYSTEM_MACROS_H_
+#ifndef MOJO_PUBLIC_CPP_SYSTEM_MACROS_H_
+#define MOJO_PUBLIC_CPP_SYSTEM_MACROS_H_
-#include "third_party/mojo/src/mojo/public/c/system/macros.h" // Symbols exposed.
+#include "mojo/public/c/system/macros.h" // Symbols exposed.
// A macro to disallow the copy constructor and operator= functions.
#define MOJO_DISALLOW_COPY_AND_ASSIGN(TypeName) \
@@ -78,4 +78,4 @@ inline void ignore_result(const T&) {
} // namespace mojo
-#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_SYSTEM_MACROS_H_
+#endif // MOJO_PUBLIC_CPP_SYSTEM_MACROS_H_
« no previous file with comments | « mojo/public/cpp/system/handle.h ('k') | mojo/public/cpp/system/message_pipe.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698