Update to Chromium version 73.0.3665.0 (#620590)

This commit is contained in:
Alexander Guettler
2019-01-17 10:56:52 +01:00
committed by Marshall Greenblatt
parent 10916749d6
commit 1a86240c93
77 changed files with 685 additions and 657 deletions

View File

@@ -125,10 +125,10 @@ index 989d5d02cedb..e05810db6824 100644
// If we broke out of the loop, we have found an enabled plugin.
bool enabled = i < matching_plugins.size();
diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
index 488d0ec60a81..9d817080555a 100644
index 73052b8be6cd..afe5c11f5550 100644
--- chrome/renderer/chrome_content_renderer_client.cc
+++ chrome/renderer/chrome_content_renderer_client.cc
@@ -804,6 +804,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -789,6 +789,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
if ((status == chrome::mojom::PluginStatus::kUnauthorized ||
status == chrome::mojom::PluginStatus::kBlocked) &&
@@ -136,7 +136,7 @@ index 488d0ec60a81..9d817080555a 100644
observer->IsPluginTemporarilyAllowed(identifier)) {
status = chrome::mojom::PluginStatus::kAllowed;
}
@@ -991,7 +992,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -976,7 +977,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
&plugin_auth_host);
plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
@@ -146,7 +146,7 @@ index 488d0ec60a81..9d817080555a 100644
break;
}
case chrome::mojom::PluginStatus::kBlocked: {
@@ -1000,7 +1002,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -985,7 +987,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name));
placeholder->AllowLoading();
RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked"));
@@ -156,7 +156,7 @@ index 488d0ec60a81..9d817080555a 100644
break;
}
case chrome::mojom::PluginStatus::kBlockedByPolicy: {
@@ -1010,7 +1013,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -995,7 +998,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
group_name));
RenderThread::Get()->RecordAction(
UserMetricsAction("Plugin_BlockedByPolicy"));
@@ -166,7 +166,7 @@ index 488d0ec60a81..9d817080555a 100644
break;
}
case chrome::mojom::PluginStatus::kBlockedNoLoading: {
@@ -1018,7 +1022,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1003,7 +1007,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
IDR_BLOCKED_PLUGIN_HTML,
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING,
group_name));