github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump chromium to 92.0.4511.0 (master) (#29173)

Browse Source
This commit is contained in:
electron-roller[bot]
2021-05-19 16:15:47 -07:00
committed by GitHub
parent d79ebc6dc6
commit 039f3d5cd2
80 changed files with 426 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shell/app/electron_content_client.cc
View File

@@ -128,7 +128,7 @@ void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) {
// here.
content::WebPluginInfo info;
info.type = content::WebPluginInfo::PLUGIN_TYPE_BROWSER_PLUGIN;
info.name = base::UTF8ToUTF16("Chromium PDF Viewer");
info.name = u"Chromium PDF Viewer";
// This isn't a real file path; it's just used as a unique identifier.
info.path = base::FilePath::FromUTF8Unsafe(extension_misc::kPdfExtensionId);
info.background_color = content::WebPluginInfo::kDefaultBackgroundColor;

2
shell/app/electron_main_delegate.cc
View File

@@ -328,7 +328,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
}
}
void ElectronMainDelegate::PreCreateMainMessageLoop() {
void ElectronMainDelegate::PreBrowserMain() {
// This is initialized early because the service manager reads some feature
// flags and we need to make sure the feature list is initialized before the
// service manager reads the features.

2
shell/app/electron_main_delegate.h
View File

@@ -30,7 +30,7 @@ class ElectronMainDelegate : public content::ContentMainDelegate {
// content::ContentMainDelegate:
bool BasicStartupComplete(int* exit_code) override;
void PreSandboxStartup() override;
void PreCreateMainMessageLoop() override;
void PreBrowserMain() override;
content::ContentBrowserClient* CreateContentBrowserClient() override;
content::ContentGpuClient* CreateContentGpuClient() override;
content::ContentRendererClient* CreateContentRendererClient() override;