Index: chrome/browser/media/media_stream_devices_controller.cc |
diff --git a/chrome/browser/media/media_stream_devices_controller.cc b/chrome/browser/media/media_stream_devices_controller.cc |
index ab5ed915690066ffcaeb3b0c38dd357363ae70ed..26d411d7fb394de870e181d1dd35ac3cc146341b 100644 |
--- a/chrome/browser/media/media_stream_devices_controller.cc |
+++ b/chrome/browser/media/media_stream_devices_controller.cc |
@@ -233,6 +233,18 @@ bool MediaStreamDevicesController::IsAskingForVideo() const { |
return old_video_setting_ == CONTENT_SETTING_ASK; |
} |
+base::string16 MediaStreamDevicesController::GetMessageText() const { |
felt
2016/04/21 13:57:08
why does media stream still need this?
benwells
2016/04/21 23:47:57
Media Stream is a bit wonky still (but Tim's fixin
|
+ int message_id = IDS_MEDIA_CAPTURE_AUDIO_AND_VIDEO; |
+ if (!IsAskingForAudio()) |
+ message_id = IDS_MEDIA_CAPTURE_VIDEO_ONLY; |
+ else if (!IsAskingForVideo()) |
+ message_id = IDS_MEDIA_CAPTURE_AUDIO_ONLY; |
+ return l10n_util::GetStringFUTF16( |
+ message_id, |
+ url_formatter::FormatUrlForSecurityDisplay( |
+ GetOrigin(), url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC)); |
+} |
+ |
void MediaStreamDevicesController::ForcePermissionDeniedTemporarily() { |
base::AutoReset<bool> persist_permissions( |
&persist_permission_changes_, false); |
@@ -250,18 +262,6 @@ int MediaStreamDevicesController::GetIconId() const { |
return IDR_INFOBAR_MEDIA_STREAM_MIC; |
} |
-base::string16 MediaStreamDevicesController::GetMessageText() const { |
- int message_id = IDS_MEDIA_CAPTURE_AUDIO_AND_VIDEO; |
- if (!IsAskingForAudio()) |
- message_id = IDS_MEDIA_CAPTURE_VIDEO_ONLY; |
- else if (!IsAskingForVideo()) |
- message_id = IDS_MEDIA_CAPTURE_AUDIO_ONLY; |
- return l10n_util::GetStringFUTF16( |
- message_id, |
- url_formatter::FormatUrlForSecurityDisplay( |
- GetOrigin(), url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC)); |
-} |
- |
base::string16 MediaStreamDevicesController::GetMessageTextFragment() const { |
int message_id = IDS_MEDIA_CAPTURE_AUDIO_AND_VIDEO_PERMISSION_FRAGMENT; |
if (!IsAskingForAudio()) |