mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
chore: bump chromium to 138.0.7178.0 (37-x-y) (#47106)
* chore: bump chromium in DEPS to 138.0.7178.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * 6351556: [source-phase-imports] Support Wasm Source Phase Imports Refs https://chromium-review.googlesource.com/c/chromium/src/+/6351556 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * chore: update patches Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * 6509682: extensions: Use ChromeExtensionsBrowserClient on desktop Android, part 2 Refs https://chromium-review.googlesource.com/c/chromium/src/+/6509682 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
This commit is contained in:
@@ -438,6 +438,7 @@ int ElectronBrowserMainParts::PreMainMessageLoopRun() {
|
||||
// BrowserContextKeyedAPIServiceFactories require an ExtensionsBrowserClient.
|
||||
extensions_browser_client_ =
|
||||
std::make_unique<ElectronExtensionsBrowserClient>();
|
||||
extensions_browser_client_->Init();
|
||||
extensions::ExtensionsBrowserClient::Set(extensions_browser_client_.get());
|
||||
|
||||
extensions::EnsureBrowserContextKeyedServiceFactoriesBuilt();
|
||||
|
||||
@@ -55,24 +55,27 @@ using extensions::ExtensionsBrowserClient;
|
||||
namespace electron {
|
||||
|
||||
ElectronExtensionsBrowserClient::ElectronExtensionsBrowserClient()
|
||||
: api_client_(std::make_unique<extensions::ElectronExtensionsAPIClient>()),
|
||||
process_manager_delegate_(
|
||||
std::make_unique<extensions::ElectronProcessManagerDelegate>()),
|
||||
extension_cache_(std::make_unique<extensions::NullExtensionCache>()) {
|
||||
// Electron does not have a concept of channel, so leave UNKNOWN to
|
||||
// enable all channel-dependent extension APIs.
|
||||
extensions::SetCurrentChannel(version_info::Channel::UNKNOWN);
|
||||
resource_manager_ =
|
||||
std::make_unique<extensions::ElectronComponentExtensionResourceManager>();
|
||||
|
||||
: extension_cache_(std::make_unique<extensions::NullExtensionCache>()) {
|
||||
AddAPIProvider(
|
||||
std::make_unique<extensions::CoreExtensionsBrowserAPIProvider>());
|
||||
AddAPIProvider(
|
||||
std::make_unique<extensions::ElectronExtensionsBrowserAPIProvider>());
|
||||
|
||||
// Electron does not have a concept of channel, so leave UNKNOWN to
|
||||
// enable all channel-dependent extension APIs.
|
||||
extensions::SetCurrentChannel(version_info::Channel::UNKNOWN);
|
||||
}
|
||||
|
||||
ElectronExtensionsBrowserClient::~ElectronExtensionsBrowserClient() = default;
|
||||
|
||||
void ElectronExtensionsBrowserClient::Init() {
|
||||
process_manager_delegate_ =
|
||||
std::make_unique<extensions::ElectronProcessManagerDelegate>();
|
||||
api_client_ = std::make_unique<extensions::ElectronExtensionsAPIClient>();
|
||||
resource_manager_ =
|
||||
std::make_unique<extensions::ElectronComponentExtensionResourceManager>();
|
||||
}
|
||||
|
||||
bool ElectronExtensionsBrowserClient::IsShuttingDown() {
|
||||
return electron::Browser::Get()->is_shutting_down();
|
||||
}
|
||||
|
||||
@@ -51,6 +51,7 @@ class ElectronExtensionsBrowserClient
|
||||
const ElectronExtensionsBrowserClient&) = delete;
|
||||
|
||||
// ExtensionsBrowserClient overrides:
|
||||
void Init() override;
|
||||
bool IsShuttingDown() override;
|
||||
bool AreExtensionsDisabled(const base::CommandLine& command_line,
|
||||
content::BrowserContext* context) override;
|
||||
|
||||
Reference in New Issue
Block a user