media/audio/audio_output_controller.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: media/audio/audio_output_controller.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: media/audio/audio_output_controller.h

diff --git a/media/audio/audio_output_controller.h b/media/audio/audio_output_controller.h

index 0a191e3271a8d29fd208a02b1c13639cb709d6ac..37781711cfeabbfe1123f0774c0b1a7defdd8dad 100644

--- a/media/audio/audio_output_controller.h

+++ b/media/audio/audio_output_controller.h

@@ -5,9 +5,9 @@

#ifndef MEDIA_AUDIO_AUDIO_OUTPUT_CONTROLLER_H_

#define MEDIA_AUDIO_AUDIO_OUTPUT_CONTROLLER_H_

-#include "base/lock.h"

#include "base/ref_counted.h"

#include "base/scoped_ptr.h"

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

#include "base/time.h"

#include "media/audio/audio_buffers_state.h"

#include "media/audio/audio_io.h"

@@ -187,7 +187,7 @@ class AudioOutputController

AudioBuffersState buffers_state_;

// The |lock_| must be acquired whenever we access |buffer_|.

- Lock lock_;

+ base::Lock lock_;

media::SeekableBuffer buffer_;

« no previous file with comments | « media/audio/audio_input_controller.cc ('k') | media/audio/audio_output_controller.cc » ('j') | no next file with comments »