chrome/browser/sync/syncable/directory_manager.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/syncable/directory_manager.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/syncable/directory_manager.h

diff --git a/chrome/browser/sync/syncable/directory_manager.h b/chrome/browser/sync/syncable/directory_manager.h

index 0c0b55d1cbc532bcd46057e01109d33ef547c757..625d08281b9172c3daa334209ff1d72dd467ea40 100644

--- a/chrome/browser/sync/syncable/directory_manager.h

+++ b/chrome/browser/sync/syncable/directory_manager.h

@@ -18,7 +18,7 @@

#include "base/basictypes.h"

#include "base/file_path.h"

-#include "base/lock.h"

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

#include "chrome/browser/sync/syncable/dir_open_result.h"

#include "chrome/browser/sync/syncable/path_name_cmp.h"

#include "chrome/browser/sync/syncable/syncable.h"

@@ -87,7 +87,7 @@ class DirectoryManager {

const FilePath root_path_;

// protects managed_directory_

- Lock lock_;

+ base::Lock lock_;

Directory* managed_directory_;

Channel* const channel_;

« no previous file with comments | « chrome/browser/sync/glue/sync_backend_host.cc ('k') | chrome/browser/sync/syncable/directory_manager.cc » ('j') | no next file with comments »