diff options
| author | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
| commit | 3345a6884c488ff3a535c2c9acdd33d74b37e311 (patch) | |
| tree | 7784b988ef1698cb6967ea1bdf07616237716c6c /base/lock_impl_win.cc | |
| parent | efc8475837ec58186051f23bb03542620424f6ce (diff) | |
| download | external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.zip external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.gz external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.bz2 | |
Merge Chromium at 7.0.540.0 : Initial merge by git
Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.
Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
Diffstat (limited to 'base/lock_impl_win.cc')
| -rw-r--r-- | base/lock_impl_win.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/base/lock_impl_win.cc b/base/lock_impl_win.cc index 14b76f8..8c03b61 100644 --- a/base/lock_impl_win.cc +++ b/base/lock_impl_win.cc @@ -3,7 +3,6 @@ // found in the LICENSE file. #include "base/lock_impl.h" -#include "base/logging.h" LockImpl::LockImpl() { // The second parameter is the spin count, for short-held locks it avoid the @@ -29,4 +28,3 @@ void LockImpl::Lock() { void LockImpl::Unlock() { ::LeaveCriticalSection(&os_lock_); } - |