summaryrefslogtreecommitdiffstats
path: root/content/renderer/media
diff options
context:
space:
mode:
authormad@chromium.org <mad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-08 18:00:57 +0000
committermad@chromium.org <mad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-08 18:00:57 +0000
commitcf3349c994f98fe776dd41c2faed71444dff4804 (patch)
tree5cb55c5f928af30c8e1d6c93ed75becf42e6469b /content/renderer/media
parent3fc5d55537b114f6f1e655f2e495b8fa88967ea5 (diff)
downloadchromium_src-cf3349c994f98fe776dd41c2faed71444dff4804.zip
chromium_src-cf3349c994f98fe776dd41c2faed71444dff4804.tar.gz
chromium_src-cf3349c994f98fe776dd41c2faed71444dff4804.tar.bz2
Revert 125629 - Adding a skeleton MediaStreamCenter.
Replacing http://codereview.chromium.org/9309078/ BUG= TEST= Review URL: http://codereview.chromium.org/9619006 TBR=mflodman@chromium.org Review URL: https://chromiumcodereview.appspot.com/9639017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125631 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/media')
-rw-r--r--content/renderer/media/media_stream_center.cc44
-rw-r--r--content/renderer/media/media_stream_center.h50
2 files changed, 0 insertions, 94 deletions
diff --git a/content/renderer/media/media_stream_center.cc b/content/renderer/media/media_stream_center.cc
deleted file mode 100644
index 172a151..0000000
--- a/content/renderer/media/media_stream_center.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) 2012 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.
-
-#include "content/renderer/media/media_stream_center.h"
-
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamCenterClient.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamDescriptor.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamSource.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamSourcesRequest.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
-
-namespace content {
-
-MediaStreamCenter::MediaStreamCenter(
- WebKit::WebMediaStreamCenterClient* client)
- : client_(client) {
-}
-
-void MediaStreamCenter::queryMediaStreamSources(
- const WebKit::WebMediaStreamSourcesRequest& request) {
- WebKit::WebVector<WebKit::WebMediaStreamSource> audioSources, videoSources;
- request.didCompleteQuery(audioSources, videoSources);
-}
-
-void MediaStreamCenter::didEnableMediaStreamTrack(
- const WebKit::WebMediaStreamDescriptor& stream,
- const WebKit::WebMediaStreamComponent& component) {
-}
-
-void MediaStreamCenter::didDisableMediaStreamTrack(
- const WebKit::WebMediaStreamDescriptor& stream,
- const WebKit::WebMediaStreamComponent& component) {
-}
-
-void MediaStreamCenter::didStopLocalMediaStream(
- const WebKit::WebMediaStreamDescriptor& stream) {
-}
-
-void MediaStreamCenter::didConstructMediaStream(
- const WebKit::WebMediaStreamDescriptor& stream) {
-}
-
-} // namespace content
diff --git a/content/renderer/media/media_stream_center.h b/content/renderer/media/media_stream_center.h
deleted file mode 100644
index 11c1fc4..0000000
--- a/content/renderer/media/media_stream_center.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2012 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.
-
-#ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CENTER_H_
-#define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CENTER_H_
-
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "content/common/content_export.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamCenter.h"
-
-namespace WebKit {
-class WebMediaStreamCenterClient;
-}
-
-namespace content {
-
-class CONTENT_EXPORT MediaStreamCenter
- : NON_EXPORTED_BASE(public WebKit::WebMediaStreamCenter) {
- public:
- explicit MediaStreamCenter(WebKit::WebMediaStreamCenterClient* client);
-
- virtual void queryMediaStreamSources(
- const WebKit::WebMediaStreamSourcesRequest& request) OVERRIDE;
-
- virtual void didEnableMediaStreamTrack(
- const WebKit::WebMediaStreamDescriptor& stream,
- const WebKit::WebMediaStreamComponent& component) OVERRIDE;
-
- virtual void didDisableMediaStreamTrack(
- const WebKit::WebMediaStreamDescriptor& stream,
- const WebKit::WebMediaStreamComponent& component) OVERRIDE;
-
- virtual void didStopLocalMediaStream(
- const WebKit::WebMediaStreamDescriptor& stream) OVERRIDE;
-
- virtual void didConstructMediaStream(
- const WebKit::WebMediaStreamDescriptor& stream) OVERRIDE;
-
- private:
- // Weak pointer, owned by WebKit.
- WebKit::WebMediaStreamCenterClient* client_;
-
- DISALLOW_COPY_AND_ASSIGN(MediaStreamCenter);
-};
-
-} // namespace content
-
-#endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CENTER_H_