Component extensions loading: Leverage ResourceBundle::IsGzipped.
Previously a gzipped_resource_file_map_source/header Grit output was used
to determine which component extension resources are gzipped. This is no
longer necessary.
This is in preparation of deleting gzipped_resource_file_map_source Grit
output completely.
Specifically:
- Modify chrome_url_request_util.cc to use ResourceBundle::IsGzipped.
- Remove ComponentExtensionResourceInfo struct and update all signatures,
basically reverting a lot of the changes made at r627283, since
they are no longer necessary.
- Remove last usages of type="gzipped_resource_file_map_source" in grd
files.
Bug: 961063
Change-Id: Ifc9d1535c96e4a168b3d45f3c831976e52c9444a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1601481
Reviewed-by: Devlin <[email protected]>
Reviewed-by: Dominick Ng <[email protected]>
Reviewed-by: Sam McNally <[email protected]>
Reviewed-by: Michael Spang <[email protected]>
Reviewed-by: Darren Shen <[email protected]>
Commit-Queue: Demetrios Papadopoulos <[email protected]>
Cr-Commit-Position: refs/heads/master@{#658652}
diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.cc b/chrome/browser/extensions/chrome_extensions_browser_client.cc
index d717bc7..a483305 100644
--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
@@ -201,21 +201,21 @@
base::FilePath ChromeExtensionsBrowserClient::GetBundleResourcePath(
const network::ResourceRequest& request,
const base::FilePath& extension_resources_path,
- ComponentExtensionResourceInfo* resource_info) const {
+ int* resource_id) const {
return chrome_url_request_util::GetBundleResourcePath(
- request, extension_resources_path, resource_info);
+ request, extension_resources_path, resource_id);
}
void ChromeExtensionsBrowserClient::LoadResourceFromResourceBundle(
const network::ResourceRequest& request,
network::mojom::URLLoaderRequest loader,
const base::FilePath& resource_relative_path,
- const ComponentExtensionResourceInfo& resource_info,
+ int resource_id,
const std::string& content_security_policy,
network::mojom::URLLoaderClientPtr client,
bool send_cors_header) {
chrome_url_request_util::LoadResourceFromResourceBundle(
- request, std::move(loader), resource_relative_path, resource_info,
+ request, std::move(loader), resource_relative_path, resource_id,
content_security_policy, std::move(client), send_cors_header);
}
