remoting/protocol/buffered_socket_writer.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: remoting/protocol/buffered_socket_writer.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: remoting/protocol/buffered_socket_writer.h

diff --git a/remoting/protocol/buffered_socket_writer.h b/remoting/protocol/buffered_socket_writer.h

index 3ea127e30c6de788937f4a27139de84e983401dc..1560b0f42382746a6dab408f72d64545ba4a1e9c 100644

--- a/remoting/protocol/buffered_socket_writer.h

+++ b/remoting/protocol/buffered_socket_writer.h

@@ -7,8 +7,8 @@

#include <list>

-#include "base/lock.h"

#include "base/ref_counted.h"

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

#include "net/base/io_buffer.h"

#include "net/socket/socket.h"

@@ -86,7 +86,7 @@ class BufferedSocketWriterBase

void HandleError(int result);

// Must be locked when accessing |socket_|, |queue_| and |buffer_size_|;

- Lock lock_;

+ base::Lock lock_;

net::Socket* socket_;

MessageLoop* message_loop_;

« no previous file with comments | « remoting/jingle_glue/jingle_client.cc ('k') | remoting/protocol/buffered_socket_writer.cc » ('j') | no next file with comments »