Chromium Code Reviews| Index: media/base/media_resources.h |
| diff --git a/media/base/media_resources.h b/media/base/media_resources.h |
| index 5acb3090360fbfdcfe56fb66bb676ef044b5de89..574b96baa7371401bc850f879ee1b7f50ce322f8 100644 |
| --- a/media/base/media_resources.h |
| +++ b/media/base/media_resources.h |
| @@ -10,6 +10,7 @@ |
| #include "base/strings/string16.h" |
| #include "build/build_config.h" |
| #include "media/base/media_export.h" |
| +#include "media/media_features.h" |
| namespace media { |
| @@ -27,6 +28,10 @@ enum MessageId { |
| BEAMFORMING_ON_DEFAULT_AUDIO_INPUT_DEVICE_NAME, |
| BEAMFORMING_OFF_DEFAULT_AUDIO_INPUT_DEVICE_NAME, |
| #endif |
| +#if BUILDFLAG(ENABLE_MEDIA_REMOTING) |
|
cpu_(ooo_6.6-7.5)
2016/11/08 22:23:15
is BUILDFLAG() macro defined in one of the above i
apacible
2016/11/08 23:15:13
With media_features.h, the macro is defined with b
|
| + MEDIA_REMOTING_CAST_ERROR_TEXT, |
| + MEDIA_REMOTING_CASTING_VIDEO_TEXT, |
| +#endif |
| }; |
| // Implementations are expected to convert MessageIds to generated_resources.grd |
| @@ -44,7 +49,7 @@ MEDIA_EXPORT void SetLocalizedStringProvider(LocalizedStringProvider func); |
| // Returns a resource string corresponding to |message_id|. See l10n_util.h. |
| // Returns an empty string if the LocalizedStringProvider has not been |
| // initialized or if the ID is unrecognized. |
| -std::string GetLocalizedStringUTF8(MessageId message_id); |
| +MEDIA_EXPORT std::string GetLocalizedStringUTF8(MessageId message_id); |
| base::string16 GetLocalizedStringUTF16(MessageId message_id); |
| #endif |