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

Unified Diff: content/browser/renderer_host/media/video_capture_host.h

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
Index: content/browser/renderer_host/media/video_capture_host.h
===================================================================
--- content/browser/renderer_host/media/video_capture_host.h (revision 130181)
+++ content/browser/renderer_host/media/video_capture_host.h (working copy)
@@ -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.
//
@@ -45,20 +45,18 @@
#include "content/public/browser/browser_message_filter.h"
#include "ipc/ipc_message.h"
+class AudioManager;
+
namespace content {
class ResourceContext;
} // namespace content
-namespace media {
-class AudioManager;
-}
-
class CONTENT_EXPORT VideoCaptureHost
: public content::BrowserMessageFilter,
public VideoCaptureControllerEventHandler {
public:
explicit VideoCaptureHost(content::ResourceContext* resource_context,
- media::AudioManager* audio_manager);
+ AudioManager* audio_manager);
// content::BrowserMessageFilter implementation.
virtual void OnChannelClosing() OVERRIDE;
@@ -147,7 +145,7 @@
// Used to get a pointer to VideoCaptureManager to start/stop capture devices.
content::ResourceContext* resource_context_;
- media::AudioManager* audio_manager_;
+ AudioManager* audio_manager_;
DISALLOW_COPY_AND_ASSIGN(VideoCaptureHost);
};
« no previous file with comments | « content/browser/renderer_host/media/media_stream_manager.cc ('k') | content/browser/renderer_host/media/video_capture_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698