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

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

Issue 18123002: Migrate webkit/renderer/media/ to content/renderer/media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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/renderer/media/webmediaplayer_util.h
diff --git a/webkit/renderer/media/webmediaplayer_util.h b/content/renderer/media/webmediaplayer_util.h
similarity index 79%
rename from webkit/renderer/media/webmediaplayer_util.h
rename to content/renderer/media/webmediaplayer_util.h
index aa891ac6407ef69e02a02eab687b9f53178b2474..ac4c198d32ac68d6d6fc3eb111c59606c083f104 100644
--- a/webkit/renderer/media/webmediaplayer_util.h
+++ b/content/renderer/media/webmediaplayer_util.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_UTIL_H_
-#define WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_UTIL_H_
+#ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_UTIL_H_
+#define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_UTIL_H_
#include "base/time.h"
#include "media/base/pipeline_status.h"
@@ -11,7 +11,7 @@
#include "third_party/WebKit/public/web/WebMediaPlayer.h"
#include "third_party/WebKit/public/web/WebTimeRange.h"
-namespace webkit_media {
+namespace content {
// Platform independent method for converting and rounding floating point
// seconds to an int64 timestamp.
@@ -25,6 +25,6 @@ WebKit::WebTimeRanges ConvertToWebTimeRanges(
WebKit::WebMediaPlayer::NetworkState PipelineErrorToNetworkState(
media::PipelineStatus error);
-} // namespace webkit_media
+} // namespace content
-#endif // WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_UTIL_H_
+#endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_UTIL_H_

Powered by Google App Engine
This is Rietveld 408576698