142 lines
6.6 KiB
Diff
142 lines
6.6 KiB
Diff
diff --git chrome/browser/plugins/plugin_info_host_impl.cc chrome/browser/plugins/plugin_info_host_impl.cc
|
|
index cb9253cf1ab6a..b46c6b92a30ce 100644
|
|
--- chrome/browser/plugins/plugin_info_host_impl.cc
|
|
+++ chrome/browser/plugins/plugin_info_host_impl.cc
|
|
@@ -140,6 +140,10 @@ bool IsPluginLoadingAccessibleResourceInWebView(
|
|
extensions::ExtensionRegistry* extension_registry,
|
|
int process_id,
|
|
const GURL& resource) {
|
|
+ // May be nullptr if using CEF Alloy with extensions disabled.
|
|
+ if (!extension_registry)
|
|
+ return false;
|
|
+
|
|
extensions::WebViewRendererState* renderer_state =
|
|
extensions::WebViewRendererState::GetInstance();
|
|
std::string partition_id;
|
|
diff --git chrome/browser/plugins/plugin_utils.cc chrome/browser/plugins/plugin_utils.cc
|
|
index 8b3f569882aeb..afc8007a6228b 100644
|
|
--- chrome/browser/plugins/plugin_utils.cc
|
|
+++ chrome/browser/plugins/plugin_utils.cc
|
|
@@ -70,6 +70,13 @@ PluginUtils::GetMimeTypeToExtensionIdMap(
|
|
content::BrowserContext* browser_context) {
|
|
base::flat_map<std::string, std::string> mime_type_to_extension_id_map;
|
|
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
|
+ // May be nullptr if using CEF Alloy with extensions disabled.
|
|
+ extensions::ExtensionRegistry* registry =
|
|
+ extensions::ExtensionRegistry::Get(browser_context);
|
|
+ if (!registry) {
|
|
+ return mime_type_to_extension_id_map;
|
|
+ }
|
|
+
|
|
Profile* profile = Profile::FromBrowserContext(browser_context);
|
|
if (extensions::ChromeContentBrowserClientExtensionsPart::
|
|
AreExtensionsDisabledForProfile(profile)) {
|
|
@@ -80,9 +87,6 @@ PluginUtils::GetMimeTypeToExtensionIdMap(
|
|
MimeTypesHandler::GetMIMETypeAllowlist();
|
|
// Go through the allowed extensions and try to use them to intercept
|
|
// the URL request.
|
|
- extensions::ExtensionRegistry* registry =
|
|
- extensions::ExtensionRegistry::Get(browser_context);
|
|
- DCHECK(registry);
|
|
for (const std::string& extension_id : allowlist) {
|
|
const extensions::Extension* extension =
|
|
registry->enabled_extensions().GetByID(extension_id);
|
|
diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
|
|
index a91227b208c16..d89e3d6ba0ad7 100644
|
|
--- chrome/renderer/chrome_content_renderer_client.cc
|
|
+++ chrome/renderer/chrome_content_renderer_client.cc
|
|
@@ -983,6 +983,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
|
|
|
if ((status == chrome::mojom::PluginStatus::kUnauthorized ||
|
|
status == chrome::mojom::PluginStatus::kBlocked) &&
|
|
+ content_settings_agent_delegate &&
|
|
content_settings_agent_delegate->IsPluginTemporarilyAllowed(
|
|
identifier)) {
|
|
status = chrome::mojom::PluginStatus::kAllowed;
|
|
@@ -1150,7 +1151,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
|
render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
|
|
plugin_auth_host.BindNewEndpointAndPassReceiver());
|
|
plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
|
|
- content_settings_agent->DidBlockContentType(content_type);
|
|
+ if (content_settings_agent)
|
|
+ content_settings_agent->DidBlockContentType(content_type);
|
|
break;
|
|
}
|
|
case chrome::mojom::PluginStatus::kBlocked: {
|
|
@@ -1159,7 +1161,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
|
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name));
|
|
placeholder->AllowLoading();
|
|
RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked"));
|
|
- content_settings_agent->DidBlockContentType(content_type);
|
|
+ if (content_settings_agent)
|
|
+ content_settings_agent->DidBlockContentType(content_type);
|
|
break;
|
|
}
|
|
case chrome::mojom::PluginStatus::kBlockedByPolicy: {
|
|
@@ -1169,7 +1172,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
|
group_name));
|
|
RenderThread::Get()->RecordAction(
|
|
UserMetricsAction("Plugin_BlockedByPolicy"));
|
|
- content_settings_agent->DidBlockContentType(content_type);
|
|
+ if (content_settings_agent)
|
|
+ content_settings_agent->DidBlockContentType(content_type);
|
|
break;
|
|
}
|
|
}
|
|
diff --git content/browser/browser_plugin/browser_plugin_embedder.h content/browser/browser_plugin/browser_plugin_embedder.h
|
|
index ad5f1925735fd..a871f4a7792a7 100644
|
|
--- content/browser/browser_plugin/browser_plugin_embedder.h
|
|
+++ content/browser/browser_plugin/browser_plugin_embedder.h
|
|
@@ -15,6 +15,7 @@
|
|
#define CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_EMBEDDER_H_
|
|
|
|
#include "base/memory/raw_ptr.h"
|
|
+#include "content/common/content_export.h"
|
|
|
|
namespace content {
|
|
|
|
@@ -26,7 +27,7 @@ struct NativeWebKeyboardEvent;
|
|
|
|
// TODO(wjmaclean): Get rid of "BrowserPlugin" in the name of this class.
|
|
// Perhaps "WebContentsEmbedderDelegate" would be better?
|
|
-class BrowserPluginEmbedder {
|
|
+class CONTENT_EXPORT BrowserPluginEmbedder {
|
|
public:
|
|
BrowserPluginEmbedder(const BrowserPluginEmbedder&) = delete;
|
|
BrowserPluginEmbedder& operator=(const BrowserPluginEmbedder&) = delete;
|
|
diff --git content/browser/browser_plugin/browser_plugin_guest.cc content/browser/browser_plugin/browser_plugin_guest.cc
|
|
index a7501a57c5149..1c148767f67a6 100644
|
|
--- content/browser/browser_plugin/browser_plugin_guest.cc
|
|
+++ content/browser/browser_plugin/browser_plugin_guest.cc
|
|
@@ -80,6 +80,8 @@ void BrowserPluginGuest::InitInternal(WebContentsImpl* owner_web_contents) {
|
|
GetWebContents()->GetOrCreateWebPreferences();
|
|
prefs.navigate_on_drag_drop = false;
|
|
GetWebContents()->SetWebPreferences(prefs);
|
|
+
|
|
+ owner_web_contents_ = owner_web_contents;
|
|
}
|
|
|
|
BrowserPluginGuest::~BrowserPluginGuest() = default;
|
|
diff --git content/browser/browser_plugin/browser_plugin_guest.h content/browser/browser_plugin/browser_plugin_guest.h
|
|
index 17e98b60e8f7e..41f05cdd88d40 100644
|
|
--- content/browser/browser_plugin/browser_plugin_guest.h
|
|
+++ content/browser/browser_plugin/browser_plugin_guest.h
|
|
@@ -70,6 +70,8 @@ class BrowserPluginGuest : public WebContentsObserver {
|
|
WebContentsImpl* GetWebContents() const;
|
|
RenderFrameHostImpl* GetProspectiveOuterDocument();
|
|
|
|
+ WebContentsImpl* owner_web_contents() const { return owner_web_contents_; }
|
|
+
|
|
private:
|
|
// BrowserPluginGuest is a WebContentsObserver of |web_contents| and
|
|
// |web_contents| has to stay valid for the lifetime of BrowserPluginGuest.
|
|
@@ -79,6 +81,8 @@ class BrowserPluginGuest : public WebContentsObserver {
|
|
void InitInternal(WebContentsImpl* owner_web_contents);
|
|
|
|
const raw_ptr<BrowserPluginGuestDelegate, DanglingUntriaged> delegate_;
|
|
+
|
|
+ raw_ptr<WebContentsImpl> owner_web_contents_ = nullptr;
|
|
};
|
|
|
|
} // namespace content
|