chrome/common/webmessageportchannel_impl.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/common/webmessageportchannel_impl.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/common/webmessageportchannel_impl.h

diff --git a/chrome/common/webmessageportchannel_impl.h b/chrome/common/webmessageportchannel_impl.h

index 0199ebba180d8646c0a308932e7f6ba5ae2d3cc3..7b41b6af0fb790c60295972f2d20307026d8c645 100644

--- a/chrome/common/webmessageportchannel_impl.h

+++ b/chrome/common/webmessageportchannel_impl.h

@@ -10,9 +10,9 @@

#include <vector>

#include "base/basictypes.h"

-#include "base/lock.h"

#include "base/string16.h"

#include "base/ref_counted.h"

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

#include "ipc/ipc_channel.h"

#include "third_party/WebKit/WebKit/chromium/public/WebMessagePortChannel.h"

@@ -67,7 +67,7 @@ class WebMessagePortChannelImpl

MessageQueue message_queue_;

WebKit::WebMessagePortChannelClient* client_;

- Lock lock_; // Locks access to above.

+ base::Lock lock_; // Locks access to above.

int route_id_; // The routing id for this object.

int message_port_id_; // A globally unique identifier for this message port.

« no previous file with comments | « chrome/common/sqlite_utils.cc ('k') | chrome/common/webmessageportchannel_impl.cc » ('j') | no next file with comments »