webkit/plugins/npapi/plugin_list.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/plugins/npapi/plugin_list.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: webkit/plugins/npapi/plugin_list.h

diff --git a/webkit/plugins/npapi/plugin_list.h b/webkit/plugins/npapi/plugin_list.h

index 553b554cb4379c8215d3bb7e426c97822b2b3e1a..722a00f0f5dbaee0bad38fea18baa34e3615819a 100644

--- a/webkit/plugins/npapi/plugin_list.h

+++ b/webkit/plugins/npapi/plugin_list.h

@@ -12,7 +12,7 @@

#include "base/basictypes.h"

#include "base/file_path.h"

#include "base/linked_ptr.h"

-#include "base/lock.h"

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

#include "third_party/npapi/bindings/nphostapi.h"

#include "webkit/plugins/npapi/plugin_group.h"

#include "webkit/plugins/npapi/webplugininfo.h"

@@ -336,7 +336,7 @@ class PluginList {

// Need synchronization for the above members since this object can be

// accessed on multiple threads.

- Lock lock_;

+ base::Lock lock_;

friend struct base::DefaultLazyInstanceTraits<PluginList>;

« no previous file with comments | « webkit/glue/webmediaplayer_impl.cc ('k') | webkit/plugins/npapi/plugin_list.cc » ('j') | no next file with comments »