Skip to content

Commit

Permalink
5513740: Reland "[Extensions] Restructure extensions::ProcessMap"
Browse files Browse the repository at this point in the history
  • Loading branch information
clavin authored and ckerr committed May 31, 2024
1 parent 9e5b6fd commit 11905a9
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions shell/browser/electron_browser_client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
#include "electron/fuses.h"
#include "electron/shell/common/api/api.mojom.h"
#include "extensions/browser/extension_navigation_ui_data.h"
#include "extensions/common/extension_id.h"
#include "mojo/public/cpp/bindings/binder_map.h"
#include "net/ssl/ssl_cert_request_info.h"
#include "net/ssl/ssl_private_key.h"
Expand Down Expand Up @@ -282,11 +283,10 @@ RenderProcessHostPrivilege GetPrivilegeRequiredByUrl(

RenderProcessHostPrivilege GetProcessPrivilege(
content::RenderProcessHost* process_host,
extensions::ProcessMap* process_map,
extensions::ExtensionRegistry* registry) {
std::set<std::string> extension_ids =
process_map->GetExtensionsInProcess(process_host->GetID());
if (extension_ids.empty())
extensions::ProcessMap* process_map) {
std::optional<extensions::ExtensionId> extension_id =
process_map->GetExtensionIdForProcess(process_host->GetID());
if (!extension_id.has_value())
return RenderProcessHostPrivilege::kNormal;

return RenderProcessHostPrivilege::kExtension;
Expand Down Expand Up @@ -740,8 +740,7 @@ bool ElectronBrowserClient::IsSuitableHost(
// required by the site.
RenderProcessHostPrivilege privilege_required =
GetPrivilegeRequiredByUrl(site_url, registry);
return GetProcessPrivilege(process_host, process_map, registry) ==
privilege_required;
return GetProcessPrivilege(process_host, process_map) == privilege_required;
#else
return content::ContentBrowserClient::IsSuitableHost(process_host, site_url);
#endif
Expand Down

0 comments on commit 11905a9

Please sign in to comment.