diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-17 20:16:56 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-17 20:16:56 +0000 |
| commit | 8b2cec537f3678716180467ddffaf3caa4594777 (patch) | |
| tree | 92262e0c53924d5f96d08cfae918730a16e024da /media/audio | |
| parent | ce34fe575bdff24570c078184e81373bd240069b (diff) | |
| download | chromium_src-8b2cec537f3678716180467ddffaf3caa4594777.zip chromium_src-8b2cec537f3678716180467ddffaf3caa4594777.tar.gz chromium_src-8b2cec537f3678716180467ddffaf3caa4594777.tar.bz2 | |
Revert tree bustage cause by r11904.
TBR=agl
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11906 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio')
| -rw-r--r-- | media/audio/audio_output.h | 1 | ||||
| -rw-r--r-- | media/audio/win/audio_manager_win.h | 1 | ||||
| -rw-r--r-- | media/audio/win/audio_output_win_unittest.cc | 2 | ||||
| -rw-r--r-- | media/audio/win/waveout_output_win.cc | 1 | ||||
| -rw-r--r-- | media/audio/win/waveout_output_win.h | 1 |
5 files changed, 0 insertions, 6 deletions
diff --git a/media/audio/audio_output.h b/media/audio/audio_output.h index 8f95a70..0cfca08 100644 --- a/media/audio/audio_output.h +++ b/media/audio/audio_output.h @@ -160,4 +160,3 @@ class AudioManager { #endif // MEDIA_AUDIO_AUDIO_OUTPUT_H_ - diff --git a/media/audio/win/audio_manager_win.h b/media/audio/win/audio_manager_win.h index 7ade9ec..12a4c06 100644 --- a/media/audio/win/audio_manager_win.h +++ b/media/audio/win/audio_manager_win.h @@ -40,4 +40,3 @@ class AudioManagerWin : public AudioManager { }; #endif // MEDIA_AUDIO_AUDIO_MANAGER_WIN_H_ - diff --git a/media/audio/win/audio_output_win_unittest.cc b/media/audio/win/audio_output_win_unittest.cc index 25dd7e6..d0db853 100644 --- a/media/audio/win/audio_output_win_unittest.cc +++ b/media/audio/win/audio_output_win_unittest.cc @@ -5,7 +5,6 @@ #include <windows.h> #include "base/basictypes.h" -#include "base/logging.h" #include "media/audio/audio_output.h" #include "media/audio/simple_sources.h" #include "testing/gtest/include/gtest/gtest.h" @@ -283,4 +282,3 @@ TEST(WinAudioTest, PCMWaveStreamPlay200HzTone22Kss) { oas->Stop(); oas->Close(); } - diff --git a/media/audio/win/waveout_output_win.cc b/media/audio/win/waveout_output_win.cc index fa84884..95f70ab 100644 --- a/media/audio/win/waveout_output_win.cc +++ b/media/audio/win/waveout_output_win.cc @@ -251,4 +251,3 @@ void PCMWaveOutAudioOutputStream::WaveCallback(HWAVEOUT hwo, UINT msg, obj->callback_->OnClose(obj); } } - diff --git a/media/audio/win/waveout_output_win.h b/media/audio/win/waveout_output_win.h index bdf35b3..1c8ffa6 100644 --- a/media/audio/win/waveout_output_win.h +++ b/media/audio/win/waveout_output_win.h @@ -103,4 +103,3 @@ class PCMWaveOutAudioOutputStream : public AudioOutputStream { }; #endif // MEDIA_AUDIO_WAVEOUT_OUTPUT_WIN_H_ - |