Index: media/blink/webmediaplayer_util.h |
diff --git a/content/renderer/media/webmediaplayer_util.h b/media/blink/webmediaplayer_util.h |
similarity index 53% |
rename from content/renderer/media/webmediaplayer_util.h |
rename to media/blink/webmediaplayer_util.h |
index d401c39089c151d29c8fd11c644798d6c68b45cf..159be7714ceeaeaf71dce04adbcf864b38dfe258 100644 |
--- a/content/renderer/media/webmediaplayer_util.h |
+++ b/media/blink/webmediaplayer_util.h |
@@ -2,33 +2,34 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_UTIL_H_ |
-#define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_UTIL_H_ |
+#ifndef MEDIA_BLINK_WEBMEDIAPLAYER_UTIL_H_ |
+#define MEDIA_BLINK_WEBMEDIAPLAYER_UTIL_H_ |
#include "base/time/time.h" |
+#include "media/base/media_export.h" |
#include "media/base/pipeline_status.h" |
#include "media/base/ranges.h" |
#include "third_party/WebKit/public/platform/WebMediaPlayer.h" |
#include "third_party/WebKit/public/platform/WebTimeRange.h" |
#include "url/gurl.h" |
-namespace content { |
+namespace media { |
// Platform independent method for converting and rounding floating point |
// seconds to an int64 timestamp. |
// |
// Refer to https://bugs.webkit.org/show_bug.cgi?id=52697 for details. |
-base::TimeDelta ConvertSecondsToTimestamp(double seconds); |
+base::TimeDelta MEDIA_EXPORT ConvertSecondsToTimestamp(double seconds); |
-blink::WebTimeRanges ConvertToWebTimeRanges( |
- const media::Ranges<base::TimeDelta>& ranges); |
+blink::WebTimeRanges MEDIA_EXPORT ConvertToWebTimeRanges( |
+ const Ranges<base::TimeDelta>& ranges); |
-blink::WebMediaPlayer::NetworkState PipelineErrorToNetworkState( |
- media::PipelineStatus error); |
+blink::WebMediaPlayer::NetworkState MEDIA_EXPORT PipelineErrorToNetworkState( |
+ PipelineStatus error); |
// Report the scheme of Media URIs. |
-void ReportMediaSchemeUma(const GURL& url); |
+void MEDIA_EXPORT ReportMediaSchemeUma(const GURL& url); |
-} // namespace content |
+} // namespace media |
-#endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_UTIL_H_ |
+#endif // MEDIA_BLINK_WEBMEDIAPLAYER_UTIL_H_ |