summaryrefslogtreecommitdiffstats
path: root/src/core/extensions/extensions_browser_client_qt.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/extensions/extensions_browser_client_qt.cpp')
-rw-r--r--src/core/extensions/extensions_browser_client_qt.cpp93
1 files changed, 36 insertions, 57 deletions
diff --git a/src/core/extensions/extensions_browser_client_qt.cpp b/src/core/extensions/extensions_browser_client_qt.cpp
index fc1def3ca..59c15d2f5 100644
--- a/src/core/extensions/extensions_browser_client_qt.cpp
+++ b/src/core/extensions/extensions_browser_client_qt.cpp
@@ -97,72 +97,57 @@ void DetermineCharset(const std::string &mime_type,
if (base::StartsWith(mime_type, "text/", base::CompareCase::INSENSITIVE_ASCII)) {
// All of our HTML files should be UTF-8 and for other resource types
// (like images), charset doesn't matter.
- DCHECK(base::IsStringUTF8(base::StringPiece(reinterpret_cast<const char*>(data->front()), data->size())));
+ DCHECK(base::IsStringUTF8(base::StringPiece(reinterpret_cast<const char *>(data->front()), data->size())));
*out_charset = "utf-8";
}
}
// A request for an extension resource in a Chrome .pak file. These are used
// by component extensions.
-class URLRequestResourceBundleJob : public net::URLRequestSimpleJob {
+class URLRequestResourceBundleJob : public net::URLRequestSimpleJob
+{
public:
- URLRequestResourceBundleJob(net::URLRequest *request,
- net::NetworkDelegate *network_delegate,
- const base::FilePath &filename,
- const extensions::ComponentExtensionResourceInfo &resource_info,
- const std::string &content_security_policy,
- bool send_cors_header)
- : net::URLRequestSimpleJob(request, network_delegate)
- , filename_(filename)
- , resource_info_(resource_info)
- , weak_factory_(this)
+ URLRequestResourceBundleJob(net::URLRequest *request, net::NetworkDelegate *network_delegate,
+ const base::FilePath &filename, int resource_id,
+ const std::string &content_security_policy, bool send_cors_header)
+ : net::URLRequestSimpleJob(request, network_delegate)
+ , filename_(filename)
+ , resource_id_(resource_id)
+ , weak_factory_(this)
{
// Leave cache headers out of resource bundle requests.
response_info_.headers = extensions::BuildHttpHeaders(content_security_policy, send_cors_header, base::Time());
}
- int GetRefCountedData(std::string* mime_type,
- std::string* charset,
- scoped_refptr<base::RefCountedMemory>* data,
+ int GetRefCountedData(std::string *mime_type, std::string *charset, scoped_refptr<base::RefCountedMemory> *data,
net::CompletionOnceCallback callback) const override
{
- const ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
- *data = rb.LoadDataResourceBytes(resource_info_.resource_id);
+ const ui::ResourceBundle &rb = ui::ResourceBundle::GetSharedInstance();
+ *data = rb.LoadDataResourceBytes(resource_id_);
// Add the Content-Length header now that we know the resource length.
- response_info_.headers->AddHeader(
- base::StringPrintf("%s: %s", net::HttpRequestHeaders::kContentLength,
- base::NumberToString((*data)->size()).c_str()));
+ response_info_.headers->AddHeader(base::StringPrintf("%s: %s", net::HttpRequestHeaders::kContentLength,
+ base::NumberToString((*data)->size()).c_str()));
- std::string* read_mime_type = new std::string;
+ std::string *read_mime_type = new std::string;
base::PostTaskWithTraitsAndReplyWithResult(
- FROM_HERE, {base::MayBlock()},
- base::BindOnce(&net::GetMimeTypeFromFile, filename_,
- base::Unretained(read_mime_type)),
- base::BindOnce(&URLRequestResourceBundleJob::OnMimeTypeRead,
- weak_factory_.GetWeakPtr(), mime_type, charset, *data,
- base::Owned(read_mime_type), std::move(callback)));
+ FROM_HERE, { base::MayBlock() },
+ base::BindOnce(&net::GetMimeTypeFromFile, filename_, base::Unretained(read_mime_type)),
+ base::BindOnce(&URLRequestResourceBundleJob::OnMimeTypeRead, weak_factory_.GetWeakPtr(), mime_type,
+ charset, *data, base::Owned(read_mime_type), std::move(callback)));
return net::ERR_IO_PENDING;
}
- void GetResponseInfo(net::HttpResponseInfo* info) override
- {
- *info = response_info_;
- }
+ void GetResponseInfo(net::HttpResponseInfo *info) override { *info = response_info_; }
private:
~URLRequestResourceBundleJob() override {}
- void OnMimeTypeRead(std::string *out_mime_type,
- std::string *charset,
- scoped_refptr<base::RefCountedMemory> data,
- std::string *read_mime_type,
- net::CompletionOnceCallback callback,
- bool read_result)
+ void OnMimeTypeRead(std::string *out_mime_type, std::string *charset, scoped_refptr<base::RefCountedMemory> data,
+ std::string *read_mime_type, net::CompletionOnceCallback callback, bool read_result)
{
response_info_.headers->AddHeader(
- base::StringPrintf("%s: %s", net::HttpRequestHeaders::kContentType,
- read_mime_type->c_str()));
+ base::StringPrintf("%s: %s", net::HttpRequestHeaders::kContentType, read_mime_type->c_str()));
*out_mime_type = *read_mime_type;
DetermineCharset(*read_mime_type, data.get(), charset);
int result = read_result ? net::OK : net::ERR_INVALID_URL;
@@ -173,7 +158,7 @@ private:
base::FilePath filename_;
// The resource to load.
- const extensions::ComponentExtensionResourceInfo resource_info_;
+ int resource_id_;
net::HttpResponseInfo response_info_;
@@ -267,14 +252,14 @@ net::URLRequestJob *ExtensionsBrowserClientQt::MaybeCreateResourceBundleRequestJ
// extension relative path against resources_path.
resources_path.AppendRelativePath(directory_path, &relative_path)) {
base::FilePath request_path = extensions::file_util::ExtensionURLToRelativeFilePath(request->url());
- ComponentExtensionResourceInfo resource_info;
- if (GetComponentExtensionResourceManager()->IsComponentExtensionResource(directory_path, request_path, &resource_info)) {
+ int resource_id = 0;
+ if (GetComponentExtensionResourceManager()->IsComponentExtensionResource(directory_path, request_path, &resource_id)) {
relative_path = relative_path.Append(request_path);
relative_path = relative_path.NormalizePathSeparators();
return new URLRequestResourceBundleJob(request,
network_delegate,
relative_path,
- resource_info,
+ resource_id,
content_security_policy,
send_cors_header);
}
@@ -285,9 +270,9 @@ net::URLRequestJob *ExtensionsBrowserClientQt::MaybeCreateResourceBundleRequestJ
// Return the resource relative path and id for the given request.
base::FilePath ExtensionsBrowserClientQt::GetBundleResourcePath(const network::ResourceRequest &request,
const base::FilePath &extension_resources_path,
- ComponentExtensionResourceInfo *resource_info) const
+ int *resource_id) const
{
- *resource_info = {};
+ *resource_id = 0;
// |chrome_resources_path| corresponds to src/chrome/browser/resources in
// source tree.
base::FilePath resources_path;
@@ -304,10 +289,10 @@ base::FilePath ExtensionsBrowserClientQt::GetBundleResourcePath(const network::R
const base::FilePath request_relative_path =
extensions::file_util::ExtensionURLToRelativeFilePath(request.url);
if (!ExtensionsBrowserClient::Get()->GetComponentExtensionResourceManager()->IsComponentExtensionResource(
- extension_resources_path, request_relative_path, resource_info)) {
+ extension_resources_path, request_relative_path, resource_id)) {
return base::FilePath();
}
- DCHECK_NE(0, resource_info->resource_id);
+ DCHECK_NE(0, *resource_id);
return request_relative_path;
}
@@ -317,7 +302,7 @@ base::FilePath ExtensionsBrowserClientQt::GetBundleResourcePath(const network::R
void ExtensionsBrowserClientQt::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)
@@ -356,7 +341,7 @@ PrefService *ExtensionsBrowserClientQt::GetPrefServiceForContext(BrowserContext
}
void ExtensionsBrowserClientQt::GetEarlyExtensionPrefsObservers(content::BrowserContext *context,
- std::vector<ExtensionPrefsObserver *> *observers) const
+ std::vector<EarlyExtensionPrefsObserver *> *observers) const
{
}
@@ -432,11 +417,6 @@ void ExtensionsBrowserClientQt::BroadcastEventToRenderers(events::HistogramValue
// histogram_value, event_name, std::move(args), GURL());
}
-net::NetLog *ExtensionsBrowserClientQt::GetNetLog()
-{
- return nullptr;
-}
-
ExtensionCache *ExtensionsBrowserClientQt::GetExtensionCache()
{
// Only used by Chrome via ExtensionService.
@@ -449,8 +429,7 @@ bool ExtensionsBrowserClientQt::IsBackgroundUpdateAllowed()
return true;
}
-bool ExtensionsBrowserClientQt::IsMinBrowserVersionSupported(
- const std::string &min_version)
+bool ExtensionsBrowserClientQt::IsMinBrowserVersionSupported(const std::string &min_version)
{
return true;
}
@@ -487,7 +466,7 @@ KioskDelegate *ExtensionsBrowserClientQt::GetKioskDelegate()
return nullptr;
}
-bool ExtensionsBrowserClientQt::IsScreensaverInDemoMode(const std::string& app_id)
+bool ExtensionsBrowserClientQt::IsScreensaverInDemoMode(const std::string &app_id)
{
return false;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 09:27:41 +0000