ipc/ipc_sync_channel.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: ipc/ipc_sync_channel.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: ipc/ipc_sync_channel.h

diff --git a/ipc/ipc_sync_channel.h b/ipc/ipc_sync_channel.h

index 7f2f7f42cd9e683a765407ae94463cebd8b7f499..e2d571ab68f5fb4a4eeb70ff1ad086da4b4e6dd6 100644

--- a/ipc/ipc_sync_channel.h

+++ b/ipc/ipc_sync_channel.h

@@ -10,8 +10,8 @@

#include <deque>

#include "base/basictypes.h"

-#include "base/lock.h"

#include "base/ref_counted.h"

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

#include "base/synchronization/waitable_event_watcher.h"

#include "ipc/ipc_channel_handle.h"

#include "ipc/ipc_channel_proxy.h"

@@ -119,7 +119,7 @@ class SyncChannel : public ChannelProxy,

typedef std::deque<PendingSyncMsg> PendingSyncMessageQueue;

PendingSyncMessageQueue deserializers_;

- Lock deserializers_lock_;

+ base::Lock deserializers_lock_;

scoped_refptr<ReceivedSyncMsgQueue> received_sync_msgs_;

« no previous file with comments | « ipc/ipc_channel_proxy.cc ('k') | ipc/ipc_sync_channel.cc » ('j') | no next file with comments »