chrome/browser/chromeos/pulse_audio_mixer.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/chromeos/pulse_audio_mixer.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/browser/chromeos/pulse_audio_mixer.h

diff --git a/chrome/browser/chromeos/pulse_audio_mixer.h b/chrome/browser/chromeos/pulse_audio_mixer.h

index f01e738c13393988ba1c2863895d68fba62617d3..1b987b348718277a0522c1761d0b6807d5dfb569 100644

--- a/chrome/browser/chromeos/pulse_audio_mixer.h

+++ b/chrome/browser/chromeos/pulse_audio_mixer.h

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

#include "base/basictypes.h"

#include "base/callback.h"

-#include "base/lock.h"

#include "base/scoped_ptr.h"

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

#include "base/threading/thread.h"

struct pa_context;

@@ -128,7 +128,7 @@ class PulseAudioMixer {

// For informational purposes only, just used to assert lock is held.

mutable int mainloop_lock_count_;

- mutable Lock mixer_state_lock_;

+ mutable base::Lock mixer_state_lock_;

mutable State mixer_state_;

// Cached contexts for use in PulseAudio calls.

« no previous file with comments | « chrome/browser/chromeos/login/login_utils.cc ('k') | chrome/browser/content_settings/host_content_settings_map.h » ('j') | no next file with comments »