chrome/browser/sync/engine/syncer.h - 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/engine/syncer.h

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/engine/syncer.h

diff --git a/chrome/browser/sync/engine/syncer.h b/chrome/browser/sync/engine/syncer.h

index 2789ed273594265e3794e8c15f8199930b19e609..89f1307b86fa3a1c0a3105febb3597f9756863ed 100644

--- a/chrome/browser/sync/engine/syncer.h

+++ b/chrome/browser/sync/engine/syncer.h

@@ -12,8 +12,8 @@

#include "base/basictypes.h"

#include "base/callback.h"

#include "base/gtest_prod_util.h"

-#include "base/lock.h"

#include "base/scoped_ptr.h"

+#include "base/synchronization/lock.h"

#include "chrome/browser/sync/engine/conflict_resolver.h"

#include "chrome/browser/sync/engine/syncer_types.h"

#include "chrome/browser/sync/engine/syncproto.h"

@@ -109,7 +109,7 @@ class Syncer {

SyncerStep last_step);

bool early_exit_requested_;

- Lock early_exit_requested_lock_;

+ base::Lock early_exit_requested_lock_;

int32 max_commit_batch_size_;

« no previous file with comments | « chrome/browser/sync/engine/syncapi.cc ('k') | chrome/browser/sync/engine/syncer.cc » ('j') | no next file with comments »