diff --git a/shell/browser/extensions/electron_component_extension_resource_manager.cc b/shell/browser/extensions/electron_component_extension_resource_manager.cc index 58309f93bdb5..2ef745f083ba 100644 --- a/shell/browser/extensions/electron_component_extension_resource_manager.cc +++ b/shell/browser/extensions/electron_component_extension_resource_manager.cc @@ -82,7 +82,7 @@ ElectronComponentExtensionResourceManager::GetTemplateReplacementsForExtension( } void ElectronComponentExtensionResourceManager::AddComponentResourceEntries( - const GritResourceMap* entries, + const webui::ResourcePath* entries, size_t size) { base::FilePath gen_folder_path = base::FilePath().AppendASCII( "@out_folder@/gen/chrome/browser/resources/"); @@ -90,12 +90,12 @@ void ElectronComponentExtensionResourceManager::AddComponentResourceEntries( for (size_t i = 0; i < size; ++i) { base::FilePath resource_path = - base::FilePath().AppendASCII(entries[i].name); + base::FilePath().AppendASCII(entries[i].path); resource_path = resource_path.NormalizePathSeparators(); if (!gen_folder_path.IsParent(resource_path)) { DCHECK(!base::Contains(path_to_resource_id_, resource_path)); - path_to_resource_id_[resource_path] = entries[i].value; + path_to_resource_id_[resource_path] = entries[i].id; } else { // If the resource is a generated file, strip the generated folder's path, // so that it can be served from a normal URL (as if it were not @@ -104,7 +104,7 @@ void ElectronComponentExtensionResourceManager::AddComponentResourceEntries( base::FilePath().AppendASCII(resource_path.AsUTF8Unsafe().substr( gen_folder_path.value().length())); DCHECK(!base::Contains(path_to_resource_id_, effective_path)); - path_to_resource_id_[effective_path] = entries[i].value; + path_to_resource_id_[effective_path] = entries[i].id; } } } diff --git a/shell/browser/extensions/electron_component_extension_resource_manager.h b/shell/browser/extensions/electron_component_extension_resource_manager.h index 5823ea5b2bd3..6af44b0a95c1 100644 --- a/shell/browser/extensions/electron_component_extension_resource_manager.h +++ b/shell/browser/extensions/electron_component_extension_resource_manager.h @@ -13,6 +13,7 @@ #include "base/files/file_path.h" #include "base/macros.h" #include "extensions/browser/component_extension_resource_manager.h" +#include "ui/base/webui/resource_path.h" struct GritResourceMap; @@ -32,7 +33,7 @@ class ElectronComponentExtensionResourceManager const std::string& extension_id) const override; private: - void AddComponentResourceEntries(const GritResourceMap* entries, size_t size); + void AddComponentResourceEntries(const webui::ResourcePath* entries, size_t size); // A map from a resource path to the resource ID. Used by // IsComponentExtensionResource.