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

Unified Diff: mojo/public/cpp/utility/mutex.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/utility/lib/thread_local_win.cc ('k') | mojo/public/cpp/utility/run_loop.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/cpp/utility/mutex.h
diff --git a/third_party/mojo/src/mojo/public/cpp/utility/mutex.h b/mojo/public/cpp/utility/mutex.h
similarity index 85%
rename from third_party/mojo/src/mojo/public/cpp/utility/mutex.h
rename to mojo/public/cpp/utility/mutex.h
index a9dae450949154ee5129b14b8973fce97351733d..4dc4aeecf491043a35255c5d06c7da979ff07433 100644
--- a/third_party/mojo/src/mojo/public/cpp/utility/mutex.h
+++ b/mojo/public/cpp/utility/mutex.h
@@ -2,8 +2,8 @@
// 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_PUBLIC_CPP_UTILITY_MUTEX_H_
-#define THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_UTILITY_MUTEX_H_
+#ifndef MOJO_PUBLIC_CPP_UTILITY_MUTEX_H_
+#define MOJO_PUBLIC_CPP_UTILITY_MUTEX_H_
#ifdef _WIN32
#error "Not implemented: See crbug.com/342893."
@@ -11,7 +11,7 @@
#include <pthread.h>
-#include "third_party/mojo/src/mojo/public/cpp/system/macros.h"
+#include "mojo/public/cpp/system/macros.h"
namespace mojo {
@@ -67,4 +67,4 @@ class MutexLock {
} // namespace mojo
-#endif // THIRD_PARTY_MOJO_SRC_MOJO_PUBLIC_CPP_UTILITY_MUTEX_H_
+#endif // MOJO_PUBLIC_CPP_UTILITY_MUTEX_H_
« no previous file with comments | « mojo/public/cpp/utility/lib/thread_local_win.cc ('k') | mojo/public/cpp/utility/run_loop.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698