Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1303)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/renderer_host/media/media_stream_manager.cc

Issue 9965076: Revert 130180 - Move media/audio files into media namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 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
« no previous file with comments | « content/browser/renderer_host/media/media_stream_manager.h ('k') | content/browser/renderer_host/media/video_capture_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/media/media_stream_manager.cc
===================================================================
--- content/browser/renderer_host/media/media_stream_manager.cc (revision 130181)
+++ content/browser/renderer_host/media/media_stream_manager.cc (working copy)
@@ -101,7 +101,7 @@
// static
MediaStreamManager* MediaStreamManager::GetForResourceContext(
content::ResourceContext* resource_context,
- media::AudioManager* audio_manager) {
+ AudioManager* audio_manager) {
MediaStreamManager* rv = static_cast<MediaStreamManager*>(
resource_context->GetUserData(kMediaStreamManagerKeyName));
if (!rv) {
@@ -111,7 +111,7 @@
return rv;
}
-MediaStreamManager::MediaStreamManager(media::AudioManager* audio_manager)
+MediaStreamManager::MediaStreamManager(AudioManager* audio_manager)
: ALLOW_THIS_IN_INITIALIZER_LIST(
device_settings_(new MediaStreamDeviceSettings(this))),
enumeration_in_progress_(content::NUM_MEDIA_STREAM_DEVICE_TYPES, false),
« no previous file with comments | « content/browser/renderer_host/media/media_stream_manager.h ('k') | content/browser/renderer_host/media/video_capture_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698