mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to 114.0.5715.0 (main) (#37976)

Browse source 
* chore: bump chromium in DEPS to 114.0.5712.0

* chore: update patches

* 4401084: Remove extensions::InfoMap which is no longer needed. | 4401084

* 4415646: Add more details to print settings error log | 4415646

* chore: bump chromium in DEPS to 114.0.5714.0

* chore: update patches

* chore: update libcxx filenames

* chore: bump chromium in DEPS to 114.0.5715.0

* chore: update patches

* fix extensions test

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: VerteDinde <vertedinde@electronjs.org>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
This commit is contained in:
electron-roller[bot] 2023-04-17 14:40:26 -07:00 • committed by GitHub
parent 1ffe7ee76b
commit 7a6af1a529
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
45 changed files with 174 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

1
shell/browser/electron_browser_client.cc
View file

@ -158,7 +158,6 @@
#include "extensions/browser/extensions_browser_client.h"
#include "extensions/browser/guest_view/extensions_guest_view.h"
#include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h"
#include "extensions/browser/info_map.h"
#include "extensions/browser/process_manager.h"
#include "extensions/browser/process_map.h"
#include "extensions/browser/url_loader_factory_manager.h"

21
shell/browser/extensions/electron_extension_system.cc
View file

@ -26,7 +26,6 @@
#include "electron/buildflags/buildflags.h"
#include "extensions/browser/api/app_runtime/app_runtime_api.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/info_map.h"
#include "extensions/browser/management_policy.h"
#include "extensions/browser/notification_types.h"
#include "extensions/browser/null_app_sorting.h"
@ -158,12 +157,6 @@ ElectronExtensionSystem::store_factory() {
return store_factory_;
}
InfoMap* ElectronExtensionSystem::info_map() {
if (!info_map_.get())
info_map_ = base::MakeRefCounted<InfoMap>();
return info_map_.get();
}
QuotaService* ElectronExtensionSystem::quota_service() {
return quota_service_.get();
}
@ -172,20 +165,6 @@ AppSorting* ElectronExtensionSystem::app_sorting() {
return app_sorting_.get();
}
void ElectronExtensionSystem::RegisterExtensionWithRequestContexts(
const Extension* extension,
base::OnceClosure callback) {
content::GetIOThreadTaskRunner({})->PostTaskAndReply(
FROM_HERE,
base::BindOnce(&InfoMap::AddExtension, info_map(),
base::RetainedRef(extension), base::Time::Now(), false,
false),
std::move(callback));
}
void ElectronExtensionSystem::UnregisterExtensionWithRequestContexts(
const std::string& extension_id) {}
const base::OneShotEvent& ElectronExtensionSystem::ready() const {
return ready_;
}

9
shell/browser/extensions/electron_extension_system.h
View file

@ -69,14 +69,8 @@ class ElectronExtensionSystem : public ExtensionSystem {
StateStore* rules_store() override;
StateStore* dynamic_user_scripts_store() override;
scoped_refptr<value_store::ValueStoreFactory> store_factory() override;
InfoMap* info_map() override;
QuotaService* quota_service() override;
AppSorting* app_sorting() override;
void RegisterExtensionWithRequestContexts(
const Extension* extension,
base::OnceClosure callback) override;
void UnregisterExtensionWithRequestContexts(
const std::string& extension_id) override;
const base::OneShotEvent& ready() const override;
bool is_ready() const override;
ContentVerifier* content_verifier() override;
@ -100,9 +94,6 @@ class ElectronExtensionSystem : public ExtensionSystem {
content::BrowserContext* browser_context_; // Not owned.
// Data to be accessed on the IO thread. Must outlive process_manager_.
scoped_refptr<InfoMap> info_map_;
std::unique_ptr<ServiceWorkerManager> service_worker_manager_;
std::unique_ptr<QuotaService> quota_service_;
std::unique_ptr<UserScriptManager> user_script_manager_;