diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-10-28 14:40:59 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-10-28 16:48:32 +0100 |
commit | b97f0eb87b6e6a6726b805c9de2159c6ad983f7d (patch) | |
tree | ef5984369eb0fac54704725aa8c976e8c1b059ac /src/core/extensions/component_extension_resource_manager_qt.h | |
parent | d82ff4e1d1a93bf0a31745a5454346ac54959cf8 (diff) | |
parent | de428e1a79708967f97aa8ffcbb2403d3b7d1e7f (diff) |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'src/core/extensions/component_extension_resource_manager_qt.h')
-rw-r--r-- | src/core/extensions/component_extension_resource_manager_qt.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/extensions/component_extension_resource_manager_qt.h b/src/core/extensions/component_extension_resource_manager_qt.h index c44c23439..b719c8960 100644 --- a/src/core/extensions/component_extension_resource_manager_qt.h +++ b/src/core/extensions/component_extension_resource_manager_qt.h @@ -49,7 +49,7 @@ #include "base/files/file_path.h" #include "extensions/browser/component_extension_resource_manager.h" -struct GzippedGritResourceMap; +struct GritResourceMap; namespace extensions { @@ -62,15 +62,15 @@ public: // Overridden from ComponentExtensionResourceManager: bool IsComponentExtensionResource(const base::FilePath &extension_path, const base::FilePath &resource_path, - ComponentExtensionResourceInfo *resource_info) const override; - const ui::TemplateReplacements *GetTemplateReplacementsForExtension(const std::string& extension_id) const override; + int *resource_id) const override; + const ui::TemplateReplacements *GetTemplateReplacementsForExtension(const std::string &extension_id) const override; private: - void AddComponentResourceEntries(const GzippedGritResourceMap* entries, size_t size); + void AddComponentResourceEntries(const GritResourceMap *entries, size_t size); // A map from a resource path to the resource ID. Used by // IsComponentExtensionResource. - std::map<base::FilePath, ComponentExtensionResourceInfo> path_to_resource_info_; + std::map<base::FilePath, int> path_to_resource_id_; DISALLOW_COPY_AND_ASSIGN(ComponentExtensionResourceManagerQt); }; |