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

Unified Diff: chrome/common/worker_thread_ticker.cc

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 | « chrome/common/worker_thread_ticker.h ('k') | chrome/gpu/gpu_channel.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/worker_thread_ticker.cc
diff --git a/chrome/common/worker_thread_ticker.cc b/chrome/common/worker_thread_ticker.cc
index 909cc8d547e28abb19ad5fa97c2724f3c15c7fb5..abbda88a2f2019348753ddea0c4cc7e44ca55c4c 100644
--- a/chrome/common/worker_thread_ticker.cc
+++ b/chrome/common/worker_thread_ticker.cc
@@ -44,7 +44,7 @@ WorkerThreadTicker::~WorkerThreadTicker() {
bool WorkerThreadTicker::RegisterTickHandler(Callback *tick_handler) {
DCHECK(tick_handler);
- AutoLock lock(lock_);
+ base::AutoLock lock(lock_);
// You cannot change the list of handlers when the timer is running.
// You need to call Stop first.
if (IsRunning())
@@ -55,7 +55,7 @@ bool WorkerThreadTicker::RegisterTickHandler(Callback *tick_handler) {
bool WorkerThreadTicker::UnregisterTickHandler(Callback *tick_handler) {
DCHECK(tick_handler);
- AutoLock lock(lock_);
+ base::AutoLock lock(lock_);
// You cannot change the list of handlers when the timer is running.
// You need to call Stop first.
if (IsRunning()) {
@@ -74,7 +74,7 @@ bool WorkerThreadTicker::UnregisterTickHandler(Callback *tick_handler) {
bool WorkerThreadTicker::Start() {
// Do this in a lock because we don't want 2 threads to
// call Start at the same time
- AutoLock lock(lock_);
+ base::AutoLock lock(lock_);
if (IsRunning())
return false;
if (!timer_thread_.Start())
@@ -87,7 +87,7 @@ bool WorkerThreadTicker::Start() {
bool WorkerThreadTicker::Stop() {
// Do this in a lock because we don't want 2 threads to
// call Stop at the same time
- AutoLock lock(lock_);
+ base::AutoLock lock(lock_);
if (!IsRunning())
return false;
is_running_ = false;
« no previous file with comments | « chrome/common/worker_thread_ticker.h ('k') | chrome/gpu/gpu_channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698