Commit 28430bf6 authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Compress IDR_SSL_ERROR_ASSISTANT_PB

Bug: 982762
Change-Id: I0bd114dff67bf1a1e8bf8868f13e1f96d5c8f79c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1837200
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: default avatarMustafa Emre Acer <meacer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703862}
parent 4b6d2dbb
......@@ -545,7 +545,7 @@
<include name="IDR_IME_WINDOW_CLOSE_C" file="resources\input_ime\ime_window_close_click.png" type="BINDATA" />
<include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_window_close_hover.png" type="BINDATA" />
</if>
<include name="IDR_SSL_ERROR_ASSISTANT_PB" file="${root_gen_dir}/chrome/browser/resources/ssl/ssl_error_assistant/ssl_error_assistant.pb" use_base_dir="false" type="BINDATA" />
<include name="IDR_SSL_ERROR_ASSISTANT_PB" file="${root_gen_dir}/chrome/browser/resources/ssl/ssl_error_assistant/ssl_error_assistant.pb" use_base_dir="false" type="BINDATA" compress="gzip" />
<if expr="is_android or is_linux">
<include name="IDR_SANDBOX_INTERNALS_HTML" file="resources\sandbox_internals\sandbox_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" />
<include name="IDR_SANDBOX_INTERNALS_JS" file="resources\sandbox_internals\sandbox_internals.js" type="BINDATA" compress="gzip" />
......
......@@ -318,10 +318,8 @@ SSLErrorAssistant::GetErrorAssistantProtoFromResourceBundle() {
auto proto = std::make_unique<chrome_browser_ssl::SSLErrorAssistantConfig>();
DCHECK(proto);
ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
base::StringPiece data =
bundle.GetRawDataResource(IDR_SSL_ERROR_ASSISTANT_PB);
google::protobuf::io::ArrayInputStream stream(data.data(), data.size());
return proto->ParseFromZeroCopyStream(&stream) ? std::move(proto) : nullptr;
std::string data = bundle.DecompressDataResource(IDR_SSL_ERROR_ASSISTANT_PB);
return proto->ParseFromString(data) ? std::move(proto) : nullptr;
}
void SSLErrorAssistant::SetErrorAssistantProto(
......
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