github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-08 23:18:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump chromium to 144.0.7514.0 (main) (#48840)

Browse Source 
* chore: bump chromium in DEPS to 144.0.7514.0

* chore: update patches

* 7119882: Reorganize //ui/gfx GN build target

https://chromium-review.googlesource.com/c/chromium/src/+/7119882

* Replace includes with forward declares in rect_conversions.h

https://chromium-review.googlesource.com/c/chromium/src/+/7127098

* Add ssl info to TrustedHeaderClient

https://chromium-review.googlesource.com/c/chromium/src/+/7106780

* Replace ContentPluginInfo with WebPluginInfo

https://chromium-review.googlesource.com/c/chromium/src/+/7127893

* Reland "[temporal] Unflag Temporal"

https://chromium-review.googlesource.com/c/v8/v8/+/7123876

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
electron-roller[bot]
2025-11-10 13:27:35 +01:00
committed by GitHub
parent 068ac3c405
commit a22511a196
34 changed files with 111 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
shell/app/electron_content_client.cc
View File

@@ -13,7 +13,6 @@
#include "base/files/file_util.h"
#include "base/strings/string_split.h"
#include "content/public/common/buildflags.h"
#include "content/public/common/content_constants.h"
#include "electron/buildflags/buildflags.h"
#include "electron/fuses.h"
#include "extensions/common/constants.h"
@@ -37,7 +36,7 @@
#endif // BUILDFLAG(ENABLE_PDF_VIEWER)
#if BUILDFLAG(ENABLE_PLUGINS)
#include "content/public/common/content_plugin_info.h"
#include "content/public/common/webplugininfo.h"
#endif // BUILDFLAG(ENABLE_PLUGINS)
namespace electron {
@@ -162,21 +161,25 @@ void ElectronContentClient::AddAdditionalSchemes(Schemes* schemes) {
}
void ElectronContentClient::AddPlugins(
std::vector<content::ContentPluginInfo>* plugins) {
std::vector<content::WebPluginInfo>* plugins) {
#if BUILDFLAG(ENABLE_PDF_VIEWER)
static constexpr char16_t kPDFPluginName[] = u"Chromium PDF Plugin";
static constexpr char16_t kPDFPluginDescription[] = u"Built-in PDF viewer";
static constexpr char kPDFPluginExtension[] = "pdf";
static constexpr char kPDFPluginDescription[] = "Portable Document Format";
static constexpr char kPDFPluginExtensionDescription[] =
"Portable Document Format";
content::ContentPluginInfo pdf_info;
pdf_info.is_internal = true;
pdf_info.name = kPDFInternalPluginName;
pdf_info.description = kPDFPluginDescription;
content::WebPluginInfo pdf_info;
pdf_info.name = kPDFPluginName;
// This isn't a real file path; it's just used as a unique identifier.
static constexpr std::string_view kPdfPluginPath = "internal-pdf-viewer";
pdf_info.path = base::FilePath::FromASCII(kPdfPluginPath);
content::WebPluginMimeType pdf_mime_type(
pdf::kInternalPluginMimeType, kPDFPluginExtension, kPDFPluginDescription);
pdf_info.desc = kPDFPluginDescription;
content::WebPluginMimeType pdf_mime_type(pdf::kInternalPluginMimeType,
kPDFPluginExtension,
kPDFPluginExtensionDescription);
pdf_info.mime_types.push_back(pdf_mime_type);
pdf_info.type = content::WebPluginInfo::PLUGIN_TYPE_BROWSER_INTERNAL_PLUGIN;
plugins->push_back(pdf_info);
#endif // BUILDFLAG(ENABLE_PDF_VIEWER)
}

2
shell/app/electron_content_client.h
View File

@@ -29,7 +29,7 @@ class ElectronContentClient : public content::ContentClient {
gfx::Image& GetNativeImageNamed(int resource_id) override;
base::RefCountedMemory* GetDataResourceBytes(int resource_id) override;
void AddAdditionalSchemes(Schemes* schemes) override;
void AddPlugins(std::vector<content::ContentPluginInfo>* plugins) override;
void AddPlugins(std::vector<content::WebPluginInfo>* plugins) override;
void AddContentDecryptionModules(
std::vector<content::CdmInfo>* cdms,
std::vector<media::CdmHostFilePath>* cdm_host_file_paths) override;