Index: content/renderer/media/webmediaplayer_ms.cc |
diff --git a/webkit/renderer/media/webmediaplayer_ms.cc b/content/renderer/media/webmediaplayer_ms.cc |
similarity index 97% |
rename from webkit/renderer/media/webmediaplayer_ms.cc |
rename to content/renderer/media/webmediaplayer_ms.cc |
index 12b8fcc163b31a1f863b13d2ffed47c3653a8ee0..0ba57da9abe35fc4a08b9634c38ae3ae4cc91573 100644 |
--- a/webkit/renderer/media/webmediaplayer_ms.cc |
+++ b/content/renderer/media/webmediaplayer_ms.cc |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "webkit/renderer/media/webmediaplayer_ms.h" |
+#include "content/renderer/media/webmediaplayer_ms.h" |
#include <limits> |
@@ -11,6 +11,11 @@ |
#include "base/message_loop.h" |
#include "base/metrics/histogram.h" |
#include "cc/layers/video_layer.h" |
+#include "content/renderer/media/media_stream_audio_renderer.h" |
+#include "content/renderer/media/media_stream_client.h" |
+#include "content/renderer/media/video_frame_provider.h" |
+#include "content/renderer/media/webmediaplayer_delegate.h" |
+#include "content/renderer/media/webmediaplayer_util.h" |
#include "media/base/media_log.h" |
#include "media/base/video_frame.h" |
#include "third_party/WebKit/public/platform/WebRect.h" |
@@ -20,18 +25,13 @@ |
#include "third_party/WebKit/public/web/WebMediaPlayerClient.h" |
#include "third_party/WebKit/public/web/WebView.h" |
#include "webkit/renderer/compositor_bindings/web_layer_impl.h" |
-#include "webkit/renderer/media/media_stream_audio_renderer.h" |
-#include "webkit/renderer/media/media_stream_client.h" |
-#include "webkit/renderer/media/video_frame_provider.h" |
-#include "webkit/renderer/media/webmediaplayer_delegate.h" |
-#include "webkit/renderer/media/webmediaplayer_util.h" |
using WebKit::WebCanvas; |
using WebKit::WebMediaPlayer; |
using WebKit::WebRect; |
using WebKit::WebSize; |
-namespace webkit_media { |
+namespace content { |
WebMediaPlayerMS::WebMediaPlayerMS( |
WebKit::WebFrame* frame, |
@@ -440,4 +440,4 @@ WebKit::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() { |
return client_; |
} |
-} // namespace webkit_media |
+} // namespace content |