Update to Chromium version 83.0.4103.0 (#756066)

This commit is contained in:
Marshall Greenblatt
2020-04-14 15:31:00 -04:00
parent 30d83cb94a
commit fa519f5108
56 changed files with 352 additions and 301 deletions

View File

@ -197,10 +197,10 @@ index bcb97138c321..df6792bd5317 100644
GURL webstore_url(extension_urls::GetWebstoreLaunchURL());
if (response_url.SchemeIsHTTPOrHTTPS() &&
diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
index 6600de77c3f6..dece49ca3455 100644
index b96048aec4f7..edaa78c59fe8 100644
--- chrome/renderer/chrome_content_renderer_client.cc
+++ chrome/renderer/chrome_content_renderer_client.cc
@@ -811,6 +811,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -813,6 +813,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
if ((status == chrome::mojom::PluginStatus::kUnauthorized ||
status == chrome::mojom::PluginStatus::kBlocked) &&
@ -208,7 +208,7 @@ index 6600de77c3f6..dece49ca3455 100644
content_settings_agent->IsPluginTemporarilyAllowed(identifier)) {
status = chrome::mojom::PluginStatus::kAllowed;
}
@@ -1013,7 +1014,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1015,7 +1016,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
plugin_auth_host.BindNewEndpointAndPassReceiver());
plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
@ -218,7 +218,7 @@ index 6600de77c3f6..dece49ca3455 100644
break;
}
case chrome::mojom::PluginStatus::kBlocked: {
@@ -1022,7 +1024,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1024,7 +1026,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name));
placeholder->AllowLoading();
RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked"));
@ -228,7 +228,7 @@ index 6600de77c3f6..dece49ca3455 100644
break;
}
case chrome::mojom::PluginStatus::kBlockedByPolicy: {
@@ -1032,7 +1035,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1034,7 +1037,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
group_name));
RenderThread::Get()->RecordAction(
UserMetricsAction("Plugin_BlockedByPolicy"));
@ -238,7 +238,7 @@ index 6600de77c3f6..dece49ca3455 100644
break;
}
case chrome::mojom::PluginStatus::kBlockedNoLoading: {
@@ -1040,7 +1044,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1042,7 +1046,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
IDR_BLOCKED_PLUGIN_HTML,
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING,
group_name));