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

Unified Diff: chrome/browser/sync/util/extensions_activity_monitor.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/browser/sync/util/extensions_activity_monitor.h ('k') | chrome/browser/sync/util/user_settings.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/util/extensions_activity_monitor.cc
diff --git a/chrome/browser/sync/util/extensions_activity_monitor.cc b/chrome/browser/sync/util/extensions_activity_monitor.cc
index aad4ab6c396dd69a8ae6e2f5d177c7fb944f2a30..8c7a52a4a1e66097607cb7c1ce2ac0e12f197627 100644
--- a/chrome/browser/sync/util/extensions_activity_monitor.cc
+++ b/chrome/browser/sync/util/extensions_activity_monitor.cc
@@ -65,13 +65,13 @@ ExtensionsActivityMonitor::~ExtensionsActivityMonitor() {
}
void ExtensionsActivityMonitor::GetAndClearRecords(Records* buffer) {
- AutoLock lock(records_lock_);
+ base::AutoLock lock(records_lock_);
buffer->clear();
buffer->swap(records_);
}
void ExtensionsActivityMonitor::PutRecords(const Records& records) {
- AutoLock lock(records_lock_);
+ base::AutoLock lock(records_lock_);
for (Records::const_iterator i = records.begin(); i != records.end(); ++i) {
records_[i->first].extension_id = i->second.extension_id;
records_[i->first].bookmark_write_count += i->second.bookmark_write_count;
@@ -81,7 +81,7 @@ void ExtensionsActivityMonitor::PutRecords(const Records& records) {
void ExtensionsActivityMonitor::Observe(NotificationType type,
const NotificationSource& source,
const NotificationDetails& details) {
- AutoLock lock(records_lock_);
+ base::AutoLock lock(records_lock_);
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
const Extension* extension = Source<const Extension>(source).ptr();
const BookmarksFunction* f = Details<const BookmarksFunction>(details).ptr();
« no previous file with comments | « chrome/browser/sync/util/extensions_activity_monitor.h ('k') | chrome/browser/sync/util/user_settings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698