summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/login/camera.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/chromeos/login/camera.cc')
-rw-r--r--chrome/browser/chromeos/login/camera.cc8
1 files changed, 4 insertions, 4 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());