Index: media/blink/webmediaplayer_util.h |
diff --git a/media/blink/webmediaplayer_util.h b/media/blink/webmediaplayer_util.h |
index 6359ace23978b5c921dc3d16d13cad46e54fa71a..7f4e7e96fb11a285cefff2b4bcb66bdcb7d75a23 100644 |
--- a/media/blink/webmediaplayer_util.h |
+++ b/media/blink/webmediaplayer_util.h |
@@ -8,9 +8,9 @@ |
#include "base/time/time.h" |
#include "media/base/audio_renderer_sink.h" |
#include "media/base/eme_constants.h" |
-#include "media/base/media_export.h" |
#include "media/base/pipeline_status.h" |
#include "media/base/ranges.h" |
+#include "media/blink/media_blink_export.h" |
#include "third_party/WebKit/public/platform/WebEncryptedMediaTypes.h" |
#include "third_party/WebKit/public/platform/WebMediaPlayer.h" |
#include "third_party/WebKit/public/platform/WebSetSinkIdCallbacks.h" |
@@ -19,29 +19,29 @@ |
namespace media { |
-blink::WebTimeRanges MEDIA_EXPORT ConvertToWebTimeRanges( |
- const Ranges<base::TimeDelta>& ranges); |
+blink::WebTimeRanges MEDIA_BLINK_EXPORT |
+ConvertToWebTimeRanges(const Ranges<base::TimeDelta>& ranges); |
-blink::WebMediaPlayer::NetworkState MEDIA_EXPORT PipelineErrorToNetworkState( |
- PipelineStatus error); |
+blink::WebMediaPlayer::NetworkState MEDIA_BLINK_EXPORT |
+PipelineErrorToNetworkState(PipelineStatus error); |
// Report various metrics to UMA and RAPPOR. |
-void MEDIA_EXPORT ReportMetrics(blink::WebMediaPlayer::LoadType load_type, |
- const GURL& url, |
- const GURL& origin_url); |
+void MEDIA_BLINK_EXPORT ReportMetrics(blink::WebMediaPlayer::LoadType load_type, |
+ const GURL& url, |
+ const GURL& origin_url); |
// Record a RAPPOR metric for the origin of an HLS playback. |
-void MEDIA_EXPORT RecordOriginOfHLSPlayback(const GURL& origin_url); |
+void MEDIA_BLINK_EXPORT RecordOriginOfHLSPlayback(const GURL& origin_url); |
// Convert Initialization Data Types. |
-EmeInitDataType MEDIA_EXPORT |
+EmeInitDataType MEDIA_BLINK_EXPORT |
ConvertToEmeInitDataType(blink::WebEncryptedMediaInitDataType init_data_type); |
-blink::WebEncryptedMediaInitDataType MEDIA_EXPORT |
+blink::WebEncryptedMediaInitDataType MEDIA_BLINK_EXPORT |
ConvertToWebInitDataType(EmeInitDataType init_data_type); |
// Wraps a blink::WebSetSinkIdCallbacks into a media::SwitchOutputDeviceCB |
// and binds it to the current thread |
-SwitchOutputDeviceCB MEDIA_EXPORT |
+SwitchOutputDeviceCB MEDIA_BLINK_EXPORT |
ConvertToSwitchOutputDeviceCB(blink::WebSetSinkIdCallbacks* web_callbacks); |
} // namespace media |