bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 123.0.6312.0 (#1262506)

Browse Source 
- MacOS ARM64 Official builds are currently failing due to
  https://issues.chromium.org/issues/326898585
This commit is contained in:
Marshall Greenblatt
2024-02-22 13:36:15 -05:00
parent 2c5dd120c7
commit d4cf19db29
100 changed files with 837 additions and 799 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libcef/browser/extensions/component_extension_resource_manager.cc
View File

@@ -61,7 +61,7 @@ bool CefComponentExtensionResourceManager::IsComponentExtensionResource(
const ui::TemplateReplacements*
CefComponentExtensionResourceManager::GetTemplateReplacementsForExtension(
const std::string& extension_id) const {
const ExtensionId& extension_id) const {
auto it = template_replacements_.find(extension_id);
return it != template_replacements_.end() ? &it->second : nullptr;
}

5
libcef/browser/extensions/component_extension_resource_manager.h
View File

@@ -9,6 +9,7 @@
#include "base/files/file_path.h"
#include "extensions/browser/component_extension_resource_manager.h"
#include "extensions/common/extension_id.h"
namespace webui {
struct ResourcePath;
@@ -33,7 +34,7 @@ class CefComponentExtensionResourceManager
const base::FilePath& resource_path,
int* resource_id) const override;
const ui::TemplateReplacements* GetTemplateReplacementsForExtension(
const std::string& extension_id) const override;
const ExtensionId& extension_id) const override;
private:
void AddComponentResourceEntries(const webui::ResourcePath* entries,
@@ -45,7 +46,7 @@ class CefComponentExtensionResourceManager
// A map from an extension ID to its i18n template replacements.
using TemplateReplacementMap =
std::map<std::string, ui::TemplateReplacements>;
std::map<ExtensionId, ui::TemplateReplacements>;
TemplateReplacementMap template_replacements_;
};

2
libcef/browser/extensions/extension_system.cc
View File

@@ -33,6 +33,7 @@
#include "content/public/browser/notification_source.h"
#include "content/public/browser/plugin_service.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/common/webplugininfo.h"
#include "extensions/browser/api/app_runtime/app_runtime_api.h"
#include "extensions/browser/extension_prefs.h"
#include "extensions/browser/extension_registry.h"
@@ -44,7 +45,6 @@
#include "extensions/browser/unloaded_extension_reason.h"
#include "extensions/browser/user_script_manager.h"
#include "extensions/common/constants.h"
#include "extensions/common/extension_messages.h"
#include "extensions/common/file_util.h"
#include "extensions/common/manifest_constants.h"
#include "extensions/common/manifest_handlers/mime_types_handler.h"