chrome/browser/renderer_host/accelerated_surface_container_manager_mac.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/browser/renderer_host/accelerated_surface_container_manager_mac.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 | « chrome/browser/printing/print_job_manager.cc ('k') | chrome/browser/renderer_host/accelerated_surface_container_manager_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/renderer_host/accelerated_surface_container_manager_mac.h

diff --git a/chrome/browser/renderer_host/accelerated_surface_container_manager_mac.h b/chrome/browser/renderer_host/accelerated_surface_container_manager_mac.h

index a2855a4ed8642020c711be52266ac43711c8a18e..be2806a0c48418b8fe0781b95bd0df24b2137129 100644

--- a/chrome/browser/renderer_host/accelerated_surface_container_manager_mac.h

+++ b/chrome/browser/renderer_host/accelerated_surface_container_manager_mac.h

@@ -11,7 +11,7 @@

#include "app/surface/transport_dib.h"

#include "base/basictypes.h"

-#include "base/lock.h"

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

#include "gfx/native_widget_types.h"

namespace webkit {

@@ -116,7 +116,7 @@ class AcceleratedSurfaceContainerManagerMac {

// Both |plugin_window_to_container_map_| and the

// AcceleratedSurfaceContainerMac in it are not threadsafe, but accessed from

// multiple threads. All these accesses are guarded by this lock.

- mutable Lock lock_;

+ mutable base::Lock lock_;

DISALLOW_COPY_AND_ASSIGN(AcceleratedSurfaceContainerManagerMac);

};