Commit 07ece192 authored by Sami Kyöstilä's avatar Sami Kyöstilä Committed by Guido Urdaneta

Revert "Don't include utils.js in builds anymore"

This reverts commit 0a590424.

Reason for revert: Breaks Kaleidoscope builds on waterfall: https://bugs.chromium.org/p/chromium/issues/detail?id=1146958

Original change's description:
> Don't include utils.js in builds anymore
>
> It is not used anymore since the test refactor.
>
> Change-Id: Ic8a5d95665f15f5d3498e4c29d8ffd7af6d82c5a
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2481684
> Auto-Submit: Becca Hughes <beccahughes@chromium.org>
> Reviewed-by: Tommy Steimel <steimel@chromium.org>
> Commit-Queue: Becca Hughes <beccahughes@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#825083}

TBR=beccahughes@chromium.org,steimel@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: I47771e29d137453129e50178b5865d0b62e272c3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2526089Reviewed-by: default avatarSami Kyöstilä <skyostil@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825354}
parent 4c1d2a63
......@@ -24,6 +24,7 @@
<include name="IDR_KALEIDOSCOPE_ICONS_JS" file="${root_gen_dir}/chrome/browser/media/kaleidoscope/internal/resources/icons.js" use_base_dir="false" type="BINDATA" />
<include name="IDR_KALEIDOSCOPE_JS" file="internal/resources/kaleidoscope.js" type="BINDATA" />
<include name="IDR_KALEIDOSCOPE_MESSAGES_JS" file="internal/resources/messages.js" type="BINDATA" />
<include name="IDR_KALEIDOSCOPE_UTILS_JS" file="internal/resources/utils.js" type="BINDATA" />
<include name="IDR_GEOMETRY_MOJOM_LITE_JS" file="${root_gen_dir}/ui/gfx/geometry/mojom/geometry.mojom-lite.js" use_base_dir="false" type="BINDATA" />
<include name="IDR_KALEIDOSCOPE_MOJOM_LITE_JS" file="${root_gen_dir}/chrome/browser/media/kaleidoscope/mojom/kaleidoscope.mojom-lite.js" use_base_dir="false" type="BINDATA" />
<include name="IDR_KALEIDOSCOPE_NTP_MODULE_JS" file="${root_gen_dir}/chrome/browser/media/kaleidoscope/internal/resources/module/module.js" use_base_dir="false" type="BINDATA" />
......
......@@ -272,6 +272,8 @@ content::WebUIDataSource* KaleidoscopeUI::CreateWebUIDataSource() {
html_source->AddResourcePath("kaleidoscope.js", IDR_KALEIDOSCOPE_JS);
html_source->AddResourcePath("messages.js", IDR_KALEIDOSCOPE_MESSAGES_JS);
// TODO(beccahughes): Remove
html_source->AddResourcePath("utils.js", IDR_KALEIDOSCOPE_UTILS_JS);
html_source->AddResourcePath("content-worker.js",
IDR_KALEIDOSCOPE_CONTENT_WORKER_JS);
......
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