webkit/glue/media/buffered_data_source.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: webkit/glue/media/buffered_data_source.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

« no previous file with comments | « third_party/cacheinvalidation/overrides/google/cacheinvalidation/mutex.h ('k') | webkit/glue/media/buffered_data_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webkit/glue/media/buffered_data_source.h

diff --git a/webkit/glue/media/buffered_data_source.h b/webkit/glue/media/buffered_data_source.h

index 1c4e3fa97ec4473f7c2caeaf26262d7e50c64cc5..c40b480258677a970a04a088ae9821688154d95f 100644

--- a/webkit/glue/media/buffered_data_source.h

+++ b/webkit/glue/media/buffered_data_source.h

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

#include <string>

#include "base/callback.h"

-#include "base/lock.h"

#include "base/scoped_ptr.h"

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

#include "webkit/glue/media/buffered_resource_loader.h"

namespace webkit_glue {

@@ -175,7 +175,7 @@ class BufferedDataSource : public WebDataSource {

MessageLoop* render_loop_;

// Protects |stopped_|.

- Lock lock_;

+ base::Lock lock_;

// Stop signal to suppressing activities. This variable is set on the pipeline

// thread and read from the render thread.