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

Explicitly pull-in js/assert.js in weblayer/ and android_webview/

This is in preparation of removing <include src="assert.js"> and
flattenhtml="true" from js/util.js and js/cr/ui/array_data_model.js,
which in turn is necessary to auto-generate grd entries for
ui/webui/resources/js/cr/ui/.

Bug: 1143194
Change-Id: I9d69b9597ee228aacdc186e2e158d8ebea25558c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2508355
Commit-Queue: Richard Coles <torne@chromium.org>
Auto-Submit: dpapad <dpapad@chromium.org>
Reviewed-by: default avatarRichard Coles <torne@chromium.org>
Reviewed-by: default avatarEvan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#822654}
parent 84e7a67b
...@@ -9,6 +9,7 @@ IDR_SAFE_BROWSING_CSS ...@@ -9,6 +9,7 @@ IDR_SAFE_BROWSING_CSS
IDR_SAFE_BROWSING_JS IDR_SAFE_BROWSING_JS
IDR_SAFE_BROWSING_HTML IDR_SAFE_BROWSING_HTML
IDR_WEBUI_JS_CR_JS IDR_WEBUI_JS_CR_JS
IDR_WEBUI_JS_ASSERT_JS
IDR_WEBUI_JS_UTIL_JS IDR_WEBUI_JS_UTIL_JS
IDR_WEBUI_JS_PROMISE_RESOLVER_JS IDR_WEBUI_JS_PROMISE_RESOLVER_JS
IDR_MOJO_MOJO_BINDINGS_LITE_JS IDR_MOJO_MOJO_BINDINGS_LITE_JS
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<link rel="stylesheet" href="chrome://resources/css/text_defaults.css"> <link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
<script src="chrome://resources/js/cr.js"></script> <script src="chrome://resources/js/cr.js"></script>
<script src="chrome://resources/js/assert.js"></script>
<script src="chrome://resources/js/promise_resolver.js"></script> <script src="chrome://resources/js/promise_resolver.js"></script>
<script src="chrome://resources/js/util.js"></script> <script src="chrome://resources/js/util.js"></script>
<script src="chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.js"></script> <script src="chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.js"></script>
......
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