Commit fc28a9d2 authored by dpapad's avatar dpapad Committed by Commit Bot

Replace usages of GetRawDataResource in HaTS dialogs.

GetRawDataResource assumes that underlying files are not compressed,
whereas LoadDataResourceString automatically decompresses if necessary.

This is one of many CLs, in preparation of compressing all HTML, JS,
CSS, SVG files by default (meaning without requiring compress="gzip"
to be specified).

Bug: 1068407
Change-Id: Ic65f855b9ca988b9837d28290a0903e1142c0526
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2148117
Auto-Submit: dpapad <dpapad@chromium.org>
Reviewed-by: default avatarWei Li <weili@chromium.org>
Reviewed-by: default avatarMalay Keshav <malaykeshav@chromium.org>
Commit-Queue: Malay Keshav <malaykeshav@chromium.org>
Cr-Commit-Position: refs/heads/master@{#758941}
parent 9a084b2c
......@@ -62,9 +62,9 @@ enum class DeviceInfoKey : unsigned int {
// URL.
std::string LoadLocalHtmlAsString(const std::string& site_id,
const std::string& site_context) {
std::string html_data(
ui::ResourceBundle::GetSharedInstance().GetRawDataResource(
IDR_HATS_HTML));
std::string html_data =
ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
IDR_HATS_HTML);
size_t pos = html_data.find(kScriptSrcReplacementToken);
html_data.replace(pos, strlen(kScriptSrcReplacementToken),
......
......@@ -54,8 +54,8 @@ constexpr char kBaseFormatUrl[] = "%s/async_survey?site=%s&force_https=1&sc=%s";
// survey feedback to the HaTS server.
std::string LoadLocalHtmlAsString(const std::string& site_id,
const std::string& site_context) {
base::StringPiece raw_html =
ui::ResourceBundle::GetSharedInstance().GetRawDataResource(
std::string raw_html =
ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
IDR_DESKTOP_HATS_HTML);
ui::TemplateReplacements replacements;
replacements[kScriptSrcReplacementToken] = base::StringPrintf(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment