diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-16 18:39:53 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-16 18:39:53 +0000 |
| commit | 46ce5b568acd801330e52a4e04534d9689990835 (patch) | |
| tree | 86944486c8faf85322981d343013f2de8ecfbb91 /media | |
| parent | ac201f961a6c0151dc596829584339c199527ba5 (diff) | |
| download | chromium_src-46ce5b568acd801330e52a4e04534d9689990835.zip chromium_src-46ce5b568acd801330e52a4e04534d9689990835.tar.gz chromium_src-46ce5b568acd801330e52a4e04534d9689990835.tar.bz2 | |
Revert 49982 - patch
TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/2825006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50002 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/audio/linux/alsa_output.cc | 3 | ||||
| -rw-r--r-- | media/audio/linux/alsa_output.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/media/audio/linux/alsa_output.cc b/media/audio/linux/alsa_output.cc index 1b433ba..b4c4dd2 100644 --- a/media/audio/linux/alsa_output.cc +++ b/media/audio/linux/alsa_output.cc @@ -210,8 +210,7 @@ static void Swizzle51Layout(Format* b, uint32 filled) { } // namespace -// Not in an anonymous namespace so that it can be a friend to -// AlsaPcmOutputStream. +// Not in an anonymous so that it can be a friend to AlsaPcmOutputStream. std::ostream& operator<<(std::ostream& os, AlsaPcmOutputStream::InternalState state) { switch (state) { diff --git a/media/audio/linux/alsa_output.h b/media/audio/linux/alsa_output.h index 6a2795b..5f54d3b 100644 --- a/media/audio/linux/alsa_output.h +++ b/media/audio/linux/alsa_output.h @@ -114,7 +114,6 @@ class AlsaPcmOutputStream : virtual ~AlsaPcmOutputStream(); - public: // clang workaround // Flags indicating the state of the stream. enum InternalState { kInError = 0, @@ -124,7 +123,6 @@ class AlsaPcmOutputStream : kIsStopped, kIsClosed }; - private: friend std::ostream& operator<<(std::ostream& os, InternalState); // Various tasks that complete actions started in the public API. |