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

Unified Diff: content/renderer/media/media_stream_impl.h

Issue 11232014: Move a bunch of code in content\renderer to the content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac Created 8 years, 2 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/renderer/media/media_stream_extra_data.h ('k') | content/renderer/media/media_stream_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/media_stream_impl.h
===================================================================
--- content/renderer/media/media_stream_impl.h (revision 163045)
+++ content/renderer/media/media_stream_impl.h (working copy)
@@ -26,10 +26,12 @@
class WebMediaStreamDescriptor;
}
-class MediaStreamDispatcher;
class MediaStreamDependencyFactory;
class VideoCaptureImplManager;
+namespace content {
+class MediaStreamDispatcher;
+
// MediaStreamImpl is a delegate for the Media Stream API messages used by
// WebKit. It ties together WebKit, native PeerConnection in libjingle and
// MediaStreamManager (via MediaStreamDispatcher and MediaStreamDispatcherHost)
@@ -37,7 +39,7 @@
// render thread.
// MediaStreamImpl have weak pointers to a MediaStreamDispatcher.
class CONTENT_EXPORT MediaStreamImpl
- : public content::RenderViewObserver,
+ : public RenderViewObserver,
NON_EXPORTED_BASE(public WebKit::WebUserMediaClient),
NON_EXPORTED_BASE(public webkit_media::MediaStreamClient),
public MediaStreamDispatcherEventHandler,
@@ -45,7 +47,7 @@
NON_EXPORTED_BASE(public base::NonThreadSafe) {
public:
MediaStreamImpl(
- content::RenderView* render_view,
+ RenderView* render_view,
MediaStreamDispatcher* media_stream_dispatcher,
VideoCaptureImplManager* vc_manager,
MediaStreamDependencyFactory* dependency_factory);
@@ -93,7 +95,7 @@
const media_stream::StreamDeviceInfo& device_info) OVERRIDE;
virtual void OnDeviceOpenFailed(int request_id) OVERRIDE;
- // content::RenderViewObserver OVERRIDE
+ // RenderViewObserver OVERRIDE
virtual void FrameWillClose(WebKit::WebFrame* frame) OVERRIDE;
protected:
@@ -161,4 +163,6 @@
DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl);
};
+} // namespace content
+
#endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
« no previous file with comments | « content/renderer/media/media_stream_extra_data.h ('k') | content/renderer/media/media_stream_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698