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 --- chromium/components/permissions/permission_request.cc | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'chromium/components/permissions/permission_request.cc') diff --git a/chromium/components/permissions/permission_request.cc b/chromium/components/permissions/permission_request.cc index 7ba80986e6f..4032a226ec5 100644 --- a/chromium/components/permissions/permission_request.cc +++ b/chromium/components/permissions/permission_request.cc @@ -18,6 +18,12 @@ ContentSettingsType PermissionRequest::GetContentSettingsType() const { return ContentSettingsType::DEFAULT; } +#if !defined(OS_ANDROID) +base::string16 PermissionRequest::GetChipText() const { + return base::string16(); +} +#endif + base::string16 PermissionRequest::GetMessageTextWarningFragment() const { return base::string16(); } -- cgit v1.2.1