From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- .../permissions/permission_request_impl.cc | 42 +++++++++++++++++++--- 1 file changed, 38 insertions(+), 4 deletions(-) (limited to 'chromium/components/permissions/permission_request_impl.cc') diff --git a/chromium/components/permissions/permission_request_impl.cc b/chromium/components/permissions/permission_request_impl.cc index 3d1366df87f..e354561025b 100644 --- a/chromium/components/permissions/permission_request_impl.cc +++ b/chromium/components/permissions/permission_request_impl.cc @@ -89,6 +89,7 @@ PermissionRequest::IconId PermissionRequestImpl::GetIconId() const { case ContentSettingsType::MEDIASTREAM_MIC: return vector_icons::kMicIcon; case ContentSettingsType::MEDIASTREAM_CAMERA: + case ContentSettingsType::CAMERA_PAN_TILT_ZOOM: return vector_icons::kVideocamIcon; case ContentSettingsType::ACCESSIBILITY_EVENTS: return vector_icons::kAccessibilityIcon; @@ -99,8 +100,6 @@ PermissionRequest::IconId PermissionRequestImpl::GetIconId() const { return vector_icons::kVrHeadsetIcon; case ContentSettingsType::STORAGE_ACCESS: return vector_icons::kCookieIcon; - case ContentSettingsType::CAMERA_PAN_TILT_ZOOM: - return vector_icons::kCameraPanTiltZoomIcon; case ContentSettingsType::WINDOW_PLACEMENT: return vector_icons::kWindowPlacementIcon; default: @@ -218,8 +217,7 @@ base::string16 PermissionRequestImpl::GetMessageTextFragment() const { message_id = IDS_MEDIA_CAPTURE_VIDEO_ONLY_PERMISSION_FRAGMENT; break; case ContentSettingsType::CAMERA_PAN_TILT_ZOOM: - message_id = - IDS_MEDIA_CAPTURE_CAMERA_PAN_TILT_ZOOM_ONLY_PERMISSION_FRAGMENT; + message_id = IDS_MEDIA_CAPTURE_CAMERA_PAN_TILT_ZOOM_PERMISSION_FRAGMENT; break; case ContentSettingsType::ACCESSIBILITY_EVENTS: message_id = IDS_ACCESSIBILITY_EVENTS_PERMISSION_FRAGMENT; @@ -254,6 +252,42 @@ base::string16 PermissionRequestImpl::GetMessageTextFragment() const { return l10n_util::GetStringUTF16(message_id); } +#if !defined(OS_ANDROID) +base::string16 PermissionRequestImpl::GetChipText() const { + int message_id; + switch (content_settings_type_) { + case ContentSettingsType::GEOLOCATION: + message_id = IDS_GEOLOCATION_PERMISSION_CHIP; + break; + case ContentSettingsType::NOTIFICATIONS: + message_id = IDS_NOTIFICATION_PERMISSIONS_CHIP; + break; + case ContentSettingsType::MIDI_SYSEX: + message_id = IDS_MIDI_SYSEX_PERMISSION_CHIP; + break; + case ContentSettingsType::MEDIASTREAM_MIC: + message_id = IDS_MEDIA_CAPTURE_AUDIO_ONLY_PERMISSION_CHIP; + break; + case ContentSettingsType::MEDIASTREAM_CAMERA: + message_id = IDS_MEDIA_CAPTURE_VIDEO_ONLY_PERMISSION_CHIP; + break; + case ContentSettingsType::CLIPBOARD_READ_WRITE: + message_id = IDS_CLIPBOARD_PERMISSION_CHIP; + break; + case ContentSettingsType::VR: + message_id = IDS_VR_PERMISSION_CHIP; + break; + case ContentSettingsType::AR: + message_id = IDS_AR_PERMISSION_CHIP; + break; + default: + NOTREACHED(); + return base::string16(); + } + return l10n_util::GetStringUTF16(message_id); +} +#endif + base::string16 PermissionRequestImpl::GetMessageTextWarningFragment() const { if (content_settings_type_ == ContentSettingsType::PLUGINS) return l10n_util::GetStringUTF16(IDS_FLASH_PERMISSION_WARNING_FRAGMENT); -- cgit v1.2.1