diff options
| author | vrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-02 19:50:50 +0000 |
|---|---|---|
| committer | vrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-02 19:50:50 +0000 |
| commit | f3a1b854e9afeeee2121abda50df6da9242c4410 (patch) | |
| tree | 5bd99fea32252ef037bc8b936ec19f04bd50e868 /media/audio/openbsd | |
| parent | 897bfb5aaaa57f0338a77fada1d5d3f9c3b38226 (diff) | |
| download | chromium_src-f3a1b854e9afeeee2121abda50df6da9242c4410.zip chromium_src-f3a1b854e9afeeee2121abda50df6da9242c4410.tar.gz chromium_src-f3a1b854e9afeeee2121abda50df6da9242c4410.tar.bz2 | |
Revert 130180 - Move media/audio files into media namespace
BUG=115187
TEST=compiles and runs without breaking audio tag; media_unittests, content_unittests
Review URL: https://chromiumcodereview.appspot.com/9805001
TBR=vrk@google.com
Review URL: https://chromiumcodereview.appspot.com/9965076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130182 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/openbsd')
| -rw-r--r-- | media/audio/openbsd/audio_manager_openbsd.cc | 4 | ||||
| -rw-r--r-- | media/audio/openbsd/audio_manager_openbsd.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/media/audio/openbsd/audio_manager_openbsd.cc b/media/audio/openbsd/audio_manager_openbsd.cc index 0f4314c..acdcea4 100644 --- a/media/audio/openbsd/audio_manager_openbsd.cc +++ b/media/audio/openbsd/audio_manager_openbsd.cc @@ -15,8 +15,6 @@ #include <fcntl.h> -namespace media { - // Maximum number of output streams that can be open simultaneously. static const int kMaxOutputStreams = 50; @@ -105,5 +103,3 @@ AudioOutputStream* AudioManagerOpenBSD::MakeOutputStream( AudioManager* CreateAudioManager() { return new AudioManagerOpenBSD(); } - -} // namespace media diff --git a/media/audio/openbsd/audio_manager_openbsd.h b/media/audio/openbsd/audio_manager_openbsd.h index 1635571..86b56c0 100644 --- a/media/audio/openbsd/audio_manager_openbsd.h +++ b/media/audio/openbsd/audio_manager_openbsd.h @@ -10,8 +10,6 @@ #include "base/compiler_specific.h" #include "media/audio/audio_manager_base.h" -namespace media { - class MEDIA_EXPORT AudioManagerOpenBSD : public AudioManagerBase { public: AudioManagerOpenBSD(); @@ -45,6 +43,4 @@ class MEDIA_EXPORT AudioManagerOpenBSD : public AudioManagerBase { DISALLOW_COPY_AND_ASSIGN(AudioManagerOpenBSD); }; -} // namespace media - #endif // MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_ |