chrome/renderer/media/audio_renderer_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/renderer/media/audio_renderer_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/renderer/media/audio_renderer_impl.h

diff --git a/chrome/renderer/media/audio_renderer_impl.h b/chrome/renderer/media/audio_renderer_impl.h

index 6463b27971f11741681408c601dcc5f7575a7e3c..7ea3dd504f3675fbc5e0074805233cc59fce867e 100644

--- a/chrome/renderer/media/audio_renderer_impl.h

+++ b/chrome/renderer/media/audio_renderer_impl.h

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

#include "base/gtest_prod_util.h"

#include "base/message_loop.h"

#include "base/scoped_ptr.h"

-#include "base/lock.h"

#include "base/shared_memory.h"

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

#include "chrome/renderer/audio_message_filter.h"

#include "media/audio/audio_io.h"

#include "media/audio/audio_manager.h"

@@ -134,7 +134,7 @@ class AudioRendererImpl : public media::AudioRendererBase,

// - |stopped_|

// - |pending_request_|

// - |request_buffers_state_|

- Lock lock_;

+ base::Lock lock_;

// A flag that indicates this filter is called to stop.

bool stopped_;

« no previous file with comments | « chrome/plugin/plugin_channel.cc ('k') | chrome/renderer/media/audio_renderer_impl.cc » ('j') | no next file with comments »