Commit ae350f88 authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Compress IDR_TRANSLATE_JS

Bug: 982762
Change-Id: I320edd26015e34708e582b5062c8bdb7d34b1aae
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1837202
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Colin Blundell <blundell@chromium.org>
Commit-Queue: Rachel Blum <groby@chromium.org>
Reviewed-by: default avatarDavid Roger <droger@chromium.org>
Reviewed-by: default avatarColin Blundell <blundell@chromium.org>
Reviewed-by: default avatarRachel Blum <groby@chromium.org>
Cr-Commit-Position: refs/heads/master@{#704178}
parent 315250bb
...@@ -79,11 +79,9 @@ class TranslateScriptBrowserTest : public ChromeRenderViewTest { ...@@ -79,11 +79,9 @@ class TranslateScriptBrowserTest : public ChromeRenderViewTest {
protected: protected:
void InjectElementLibrary() { void InjectElementLibrary() {
std::string script; std::string script =
base::StringPiece translate_js = ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
ui::ResourceBundle::GetSharedInstance().GetRawDataResource(
IDR_TRANSLATE_JS); IDR_TRANSLATE_JS);
translate_js.CopyToString(&script);
script += kElementJs; script += kElementJs;
ExecuteScript(script); ExecuteScript(script);
} }
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<grit-part> <grit-part>
<include name="IDR_TRANSLATE_JS" file="../translate/core/browser/resources/translate.js" type="BINDATA" /> <include name="IDR_TRANSLATE_JS" file="../translate/core/browser/resources/translate.js" type="BINDATA" compress="gzip" />
</grit-part> </grit-part>
...@@ -154,10 +154,8 @@ void TranslateScript::OnScriptFetchComplete(bool success, ...@@ -154,10 +154,8 @@ void TranslateScript::OnScriptFetchComplete(bool success,
&data_, "var securityOrigin = '%s';", security_origin.spec().c_str()); &data_, "var securityOrigin = '%s';", security_origin.spec().c_str());
// Load embedded translate.js. // Load embedded translate.js.
base::StringPiece str = data_.append(ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
ui::ResourceBundle::GetSharedInstance().GetRawDataResource( IDR_TRANSLATE_JS));
IDR_TRANSLATE_JS);
str.AppendToString(&data_);
#if defined(OS_IOS) #if defined(OS_IOS)
// Append snippet to install callbacks on translate.js if available. // Append snippet to install callbacks on translate.js if available.
......
...@@ -21,11 +21,10 @@ class JsTranslateManagerTest : public PlatformTest { ...@@ -21,11 +21,10 @@ class JsTranslateManagerTest : public PlatformTest {
JsTranslateManagerTest() { JsTranslateManagerTest() {
receiver_ = [[CRWTestJSInjectionReceiver alloc] init]; receiver_ = [[CRWTestJSInjectionReceiver alloc] init];
manager_ = [[JsTranslateManager alloc] initWithReceiver:receiver_]; manager_ = [[JsTranslateManager alloc] initWithReceiver:receiver_];
base::StringPiece script = std::string script =
ui::ResourceBundle::GetSharedInstance().GetRawDataResource( ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
IDR_TRANSLATE_JS); IDR_TRANSLATE_JS);
[manager_ setScript:base::SysUTF8ToNSString(script.as_string() + [manager_ setScript:base::SysUTF8ToNSString(script + "('DummyKey');")];
"('DummyKey');")];
} }
bool IsDefined(NSString* name) { bool IsDefined(NSString* name) {
......
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