bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 69.0.3464.0 (#567918)

Browse Source
This commit is contained in:
Marshall Greenblatt
2018-06-18 18:08:20 -04:00
parent 3c3045a5cb
commit 35830c88e5
51 changed files with 538 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patch/patches/chrome_plugins.patch
View File

@ -157,10 +157,10 @@ index 484e07af5a98..0e62e20095c7 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 f0a93eb48969..a4e12d0ec28e 100644
index 6a15716bb62f..60883d8e1031 100644
--- chrome/renderer/chrome_content_renderer_client.cc
+++ chrome/renderer/chrome_content_renderer_client.cc
@@ -762,6 +762,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -761,6 +761,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
if ((status == chrome::mojom::PluginStatus::kUnauthorized ||
status == chrome::mojom::PluginStatus::kBlocked) &&
@ -168,7 +168,7 @@ index f0a93eb48969..a4e12d0ec28e 100644
observer->IsPluginTemporarilyAllowed(identifier)) {
status = chrome::mojom::PluginStatus::kAllowed;
}
@@ -949,7 +950,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -948,7 +949,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
&plugin_auth_host);
plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
@ -178,7 +178,7 @@ index f0a93eb48969..a4e12d0ec28e 100644
break;
}
case chrome::mojom::PluginStatus::kBlocked: {
@@ -958,7 +960,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -957,7 +959,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name));
placeholder->AllowLoading();
RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked"));
@ -188,7 +188,7 @@ index f0a93eb48969..a4e12d0ec28e 100644
break;
}
case chrome::mojom::PluginStatus::kBlockedByPolicy: {
@@ -968,7 +971,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -967,7 +970,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
group_name));
RenderThread::Get()->RecordAction(
UserMetricsAction("Plugin_BlockedByPolicy"));
@ -198,7 +198,7 @@ index f0a93eb48969..a4e12d0ec28e 100644
break;
}
case chrome::mojom::PluginStatus::kBlockedNoLoading: {
@@ -976,7 +980,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -975,7 +979,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
IDR_BLOCKED_PLUGIN_HTML,
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING,
group_name));