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

Unified Diff: base/synchronization/condition_variable.h

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Unified patch updating all references to the new base/synchronization/lock.h Created 9 years, 11 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
« no previous file with comments | « base/observer_list_threadsafe.h ('k') | base/synchronization/condition_variable_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/synchronization/condition_variable.h
diff --git a/base/synchronization/condition_variable.h b/base/synchronization/condition_variable.h
index 3acd0ac2c357e89b6b8f51d2c3a6b17262c47705..db75a49ae0b2e1566621de7172f98d4b6f19e6a6 100644
--- a/base/synchronization/condition_variable.h
+++ b/base/synchronization/condition_variable.h
@@ -75,7 +75,7 @@
#endif
#include "base/basictypes.h"
-#include "base/lock.h"
+#include "base/synchronization/lock.h"
namespace base {
@@ -156,10 +156,10 @@ class ConditionVariable {
RunState run_state_;
// Private critical section for access to member data.
- Lock internal_lock_;
+ base::Lock internal_lock_;
// Lock that is acquired before calling Wait().
- Lock& user_lock_;
+ base::Lock& user_lock_;
// Events that threads are blocked on.
Event waiting_list_;
@@ -176,7 +176,7 @@ class ConditionVariable {
pthread_cond_t condition_;
pthread_mutex_t* user_mutex_;
#if !defined(NDEBUG)
- Lock* user_lock_; // Needed to adjust shadow lock state on wait.
+ base::Lock* user_lock_; // Needed to adjust shadow lock state on wait.
#endif
#endif
« no previous file with comments | « base/observer_list_threadsafe.h ('k') | base/synchronization/condition_variable_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698