chrome/browser/sync/syncable/syncable.cc - Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync/syncable/syncable.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

Index: chrome/browser/sync/syncable/syncable.cc

diff --git a/chrome/browser/sync/syncable/syncable.cc b/chrome/browser/sync/syncable/syncable.cc

index 2794efababc33431c0c961bed2f3be7292ddf930..99bed4ee35657eab685fb6425937de7b38911a59 100644

--- a/chrome/browser/sync/syncable/syncable.cc

+++ b/chrome/browser/sync/syncable/syncable.cc

@@ -578,7 +578,7 @@ bool Directory::SaveChanges() {

bool success = false;

DCHECK(store_);

- AutoLock scoped_lock(kernel_->save_changes_mutex);

+ base::AutoLock scoped_lock(kernel_->save_changes_mutex);

// Snapshot and save.

SaveChangesSnapshot snapshot;

@@ -1129,7 +1129,7 @@ bool BaseTransaction::NotifyTransactionChangingAndEnding(

{

// Scoped_lock is only active through the calculate_changes and

// transaction_ending events.

- AutoLock scoped_lock(dirkernel_->changes_channel_mutex);

+ base::AutoLock scoped_lock(dirkernel_->changes_channel_mutex);

// Tell listeners to calculate changes while we still have the mutex.

DirectoryChangeEvent event = { DirectoryChangeEvent::CALCULATE_CHANGES,

« no previous file with comments | « chrome/browser/sync/syncable/syncable.h ('k') | chrome/browser/sync/util/channel.h » ('j') | no next file with comments »