diff options
Diffstat (limited to 'chrome/browser/chromeos/login')
-rw-r--r-- | chrome/browser/chromeos/login/camera.cc | 8 | ||||
-rw-r--r-- | chrome/browser/chromeos/login/camera.h | 6 | ||||
-rw-r--r-- | chrome/browser/chromeos/login/login_utils.cc | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/chrome/browser/chromeos/login/camera.cc b/chrome/browser/chromeos/login/camera.cc index bfc8136..7c2c2e4 100644 --- a/chrome/browser/chromeos/login/camera.cc +++ b/chrome/browser/chromeos/login/camera.cc @@ -324,7 +324,7 @@ void Camera::DoStopCapturing() { } void Camera::GetFrame(SkBitmap* frame) { - AutoLock lock(image_lock_); + base::AutoLock lock(image_lock_); frame->swap(frame_image_); } @@ -527,7 +527,7 @@ void Camera::ProcessImage(void* data) { } image.setIsOpaque(true); { - AutoLock lock(image_lock_); + base::AutoLock lock(image_lock_); frame_image_.swap(image); } BrowserThread::PostTask( @@ -573,13 +573,13 @@ void Camera::OnCaptureFailure() { } bool Camera::IsOnCameraThread() const { - AutoLock lock(thread_lock_); + base::AutoLock lock(thread_lock_); return thread_ && MessageLoop::current() == thread_->message_loop(); } void Camera::PostCameraTask(const tracked_objects::Location& from_here, Task* task) { - AutoLock lock(thread_lock_); + base::AutoLock lock(thread_lock_); if (!thread_) return; DCHECK(thread_->IsRunning()); diff --git a/chrome/browser/chromeos/login/camera.h b/chrome/browser/chromeos/login/camera.h index c30f2df..9b51088 100644 --- a/chrome/browser/chromeos/login/camera.h +++ b/chrome/browser/chromeos/login/camera.h @@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/lock.h" #include "base/ref_counted.h" +#include "base/synchronization/lock.h" #include "base/threading/thread.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -181,10 +181,10 @@ class Camera : public base::RefCountedThreadSafe<Camera> { SkBitmap frame_image_; // Lock that guards references to |frame_image_|. - mutable Lock image_lock_; + mutable base::Lock image_lock_; // Lock that guards references to |camera_thread_|. - mutable Lock thread_lock_; + mutable base::Lock thread_lock_; DISALLOW_COPY_AND_ASSIGN(Camera); }; diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc index a11c66f..65e4214 100644 --- a/chrome/browser/chromeos/login/login_utils.cc +++ b/chrome/browser/chromeos/login/login_utils.cc @@ -9,12 +9,12 @@ #include "base/command_line.h" #include "base/file_path.h" #include "base/file_util.h" -#include "base/lock.h" #include "base/path_service.h" #include "base/scoped_ptr.h" #include "base/singleton.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/synchronization/lock.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" @@ -172,7 +172,7 @@ class LoginUtilsWrapper { } LoginUtils* get() { - AutoLock create(create_lock_); + base::AutoLock create(create_lock_); if (!ptr_.get()) reset(new LoginUtilsImpl); return ptr_.get(); @@ -187,7 +187,7 @@ class LoginUtilsWrapper { LoginUtilsWrapper() {} - Lock create_lock_; + base::Lock create_lock_; scoped_ptr<LoginUtils> ptr_; DISALLOW_COPY_AND_ASSIGN(LoginUtilsWrapper); |