mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 92.0.4515.0 (#885287)
This commit is contained in:
@ -151,7 +151,7 @@ index a0b3175223f3e..a1117001ad1fc 100644
|
||||
Profile* profile = Profile::FromBrowserContext(browser_context);
|
||||
const std::vector<std::string>& allowlist =
|
||||
diff --git chrome/common/google_url_loader_throttle.cc chrome/common/google_url_loader_throttle.cc
|
||||
index 6555dfc37d5ce..d54030b6f2368 100644
|
||||
index e42b4e7dbdec2..a2bebe0128a04 100644
|
||||
--- chrome/common/google_url_loader_throttle.cc
|
||||
+++ chrome/common/google_url_loader_throttle.cc
|
||||
@@ -7,6 +7,7 @@
|
||||
@ -173,7 +173,7 @@ index 6555dfc37d5ce..d54030b6f2368 100644
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||
#include "extensions/common/extension_urls.h"
|
||||
#endif
|
||||
@@ -168,6 +173,11 @@ void GoogleURLLoaderThrottle::WillProcessResponse(
|
||||
@@ -157,6 +162,11 @@ void GoogleURLLoaderThrottle::WillProcessResponse(
|
||||
const GURL& response_url,
|
||||
network::mojom::URLResponseHead* response_head,
|
||||
bool* defer) {
|
||||
@ -186,10 +186,10 @@ index 6555dfc37d5ce..d54030b6f2368 100644
|
||||
// that the X-Frame-Options protection mechanism is set to either DENY or
|
||||
// SAMEORIGIN.
|
||||
diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
|
||||
index ceb29f83a9dc1..3f1601ae17931 100644
|
||||
index 21bc479c64b31..ce00212ed4f86 100644
|
||||
--- chrome/renderer/chrome_content_renderer_client.cc
|
||||
+++ chrome/renderer/chrome_content_renderer_client.cc
|
||||
@@ -862,6 +862,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
@@ -895,6 +895,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
|
||||
if ((status == chrome::mojom::PluginStatus::kUnauthorized ||
|
||||
status == chrome::mojom::PluginStatus::kBlocked) &&
|
||||
@ -197,7 +197,7 @@ index ceb29f83a9dc1..3f1601ae17931 100644
|
||||
content_settings_agent_delegate->IsPluginTemporarilyAllowed(
|
||||
identifier)) {
|
||||
status = chrome::mojom::PluginStatus::kAllowed;
|
||||
@@ -1067,7 +1068,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
@@ -1100,7 +1101,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
|
||||
plugin_auth_host.BindNewEndpointAndPassReceiver());
|
||||
plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
|
||||
@ -207,7 +207,7 @@ index ceb29f83a9dc1..3f1601ae17931 100644
|
||||
break;
|
||||
}
|
||||
case chrome::mojom::PluginStatus::kBlocked: {
|
||||
@@ -1076,7 +1078,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
@@ -1109,7 +1111,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name));
|
||||
placeholder->AllowLoading();
|
||||
RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked"));
|
||||
@ -217,7 +217,7 @@ index ceb29f83a9dc1..3f1601ae17931 100644
|
||||
break;
|
||||
}
|
||||
case chrome::mojom::PluginStatus::kBlockedByPolicy: {
|
||||
@@ -1086,7 +1089,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
@@ -1119,7 +1122,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
group_name));
|
||||
RenderThread::Get()->RecordAction(
|
||||
UserMetricsAction("Plugin_BlockedByPolicy"));
|
||||
@ -227,7 +227,7 @@ index ceb29f83a9dc1..3f1601ae17931 100644
|
||||
break;
|
||||
}
|
||||
case chrome::mojom::PluginStatus::kBlockedNoLoading: {
|
||||
@@ -1094,7 +1098,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
@@ -1127,7 +1131,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
IDR_BLOCKED_PLUGIN_HTML,
|
||||
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING,
|
||||
group_name));
|
||||
@ -238,10 +238,10 @@ index ceb29f83a9dc1..3f1601ae17931 100644
|
||||
}
|
||||
}
|
||||
diff --git content/browser/browser_plugin/browser_plugin_guest.h content/browser/browser_plugin/browser_plugin_guest.h
|
||||
index cb6a2dfb9adcf..02f316d646cf7 100644
|
||||
index bc13113e725e0..2bc15de23ec4a 100644
|
||||
--- content/browser/browser_plugin/browser_plugin_guest.h
|
||||
+++ content/browser/browser_plugin/browser_plugin_guest.h
|
||||
@@ -116,6 +116,8 @@ class CONTENT_EXPORT BrowserPluginGuest : public GuestHost,
|
||||
@@ -113,6 +113,8 @@ class CONTENT_EXPORT BrowserPluginGuest : public GuestHost,
|
||||
|
||||
gfx::Point GetScreenCoordinates(const gfx::Point& relative_position) const;
|
||||
|
||||
|
Reference in New Issue
Block a user