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

Revert "chore: bump chromium to 91.0.4448.0 (master) (#28009)"

Browse source 
This reverts commit a006cf681b.

It was squash-merged by accident; let's redo that without squashing.
This commit is contained in:
Charles Kerr 2021-03-30 21:28:40 -05:00
parent a006cf681b
commit b9ea4a6ba4
233 changed files with 1469 additions and 1586 deletions
Download patch file Download diff file Expand all files Collapse all files

2
shell/browser/extensions/api/management/electron_management_api_delegate.cc
View file

@ -204,7 +204,7 @@ bool ElectronManagementAPIDelegate::UninstallExtension(
content::BrowserContext* context,
const std::string& transient_extension_id,
extensions::UninstallReason reason,
std::u16string* error) const {
base::string16* error) const {
// TODO(sentialx): we don't have ExtensionService
// return extensions::ExtensionSystem::Get(context)
// ->extension_service()

2
shell/browser/extensions/api/management/electron_management_api_delegate.h
View file

@ -73,7 +73,7 @@ class ElectronManagementAPIDelegate : public extensions::ManagementAPIDelegate {
bool UninstallExtension(content::BrowserContext* context,
const std::string& transient_extension_id,
extensions::UninstallReason reason,
std::u16string* error) const override;
base::string16* error) const override;
void SetLaunchType(content::BrowserContext* context,
const std::string& extension_id,
extensions::LaunchType launch_type) const override;

4
shell/browser/extensions/api/tabs/tabs_api.cc
View file

@ -10,7 +10,6 @@
#include "extensions/browser/extension_api_frame_id_map.h"
#include "extensions/common/error_utils.h"
#include "extensions/common/manifest_constants.h"
#include "extensions/common/mojom/host_id.mojom.h"
#include "extensions/common/permissions/permissions_data.h"
#include "shell/browser/api/electron_api_web_contents.h"
#include "shell/browser/web_contents_zoom_controller.h"
@ -85,8 +84,7 @@ ExecuteCodeFunction::InitResult ExecuteCodeInTabFunction::Init() {
execute_tab_id_ = tab_id;
details_ = std::move(details);
set_host_id(
mojom::HostID(mojom::HostID::HostType::kExtensions, extension()->id()));
set_host_id(HostID(HostID::EXTENSIONS, extension()->id()));
return set_init_result(SUCCESS);
}