From f3a1b854e9afeeee2121abda50df6da9242c4410 Mon Sep 17 00:00:00 2001 From: "vrk@google.com" Date: Mon, 2 Apr 2012 19:50:50 +0000 Subject: 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 --- media/audio/simple_sources.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'media/audio/simple_sources.h') diff --git a/media/audio/simple_sources.h b/media/audio/simple_sources.h index fa06857..a4373a0 100644 --- a/media/audio/simple_sources.h +++ b/media/audio/simple_sources.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -10,8 +10,6 @@ #include "media/audio/audio_io.h" #include "media/base/seekable_buffer.h" -namespace media { - // An audio source that produces a pure sinusoidal tone. class MEDIA_EXPORT SineWaveAudioSource : public AudioOutputStream::AudioSourceCallback { @@ -90,6 +88,4 @@ class MEDIA_EXPORT PushSource media::SeekableBuffer buffer_; }; -} // namespace media - #endif // MEDIA_AUDIO_SIMPLE_SOURCES_H_ -- cgit v1.1