Commit 05f7a92e authored by dpapad's avatar dpapad Committed by Commit Bot

Explicitly pull-in js/assert.js in ui/file_manager/

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: I128845c864e439cbf262f343cfa77153916d8dfd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2504740
Commit-Queue: dpapad <dpapad@chromium.org>
Reviewed-by: default avatarLuciano Pacheco <lucmult@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821823}
parent 95abdde0
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
<link rel="stylesheet" href="chrome://resources/css/text_defaults.css"> <link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
<link rel="stylesheet" type="text/css" href="css/audio_player.css"> <link rel="stylesheet" type="text/css" href="css/audio_player.css">
<script src="chrome://resources/js/assert.js"></script>
<script src="chrome://resources/js/util.js"></script> <script src="chrome://resources/js/util.js"></script>
<link rel="import" href="elements/audio_player.html"> <link rel="import" href="elements/audio_player.html">
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<script src="chrome://resources/js/cr.js"></script> <script src="chrome://resources/js/cr.js"></script>
<script src="chrome://resources/js/cr/event_target.js"></script> <script src="chrome://resources/js/cr/event_target.js"></script>
<script src="chrome://resources/js/cr/ui.js"></script> <script src="chrome://resources/js/cr/ui.js"></script>
<script src="chrome://resources/js/assert.js"></script>
<script src="chrome://resources/js/cr/ui/array_data_model.js"></script> <script src="chrome://resources/js/cr/ui/array_data_model.js"></script>
<script src="chrome://resources/js/cr/ui/dialogs.js"></script> <script src="chrome://resources/js/cr/ui/dialogs.js"></script>
<script src="chrome://resources/js/load_time_data.js"></script> <script src="chrome://resources/js/load_time_data.js"></script>
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<script src="chrome://resources/js/cr.js"></script> <script src="chrome://resources/js/cr.js"></script>
<script src="chrome://resources/js/cr/event_target.js"></script> <script src="chrome://resources/js/cr/event_target.js"></script>
<script src="chrome://resources/js/assert.js"></script>
<script src="chrome://resources/js/cr/ui/array_data_model.js"></script> <script src="chrome://resources/js/cr/ui/array_data_model.js"></script>
<script src="chrome://resources/js/load_time_data.js"></script> <script src="chrome://resources/js/load_time_data.js"></script>
<script src="background/js/background_common_scripts.js"></script> <script src="background/js/background_common_scripts.js"></script>
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
// <include src="../../../image_loader/load_image_request.js"> // <include src="../../../image_loader/load_image_request.js">
// <include src="../../../image_loader/image_loader_client.js"> // <include src="../../../image_loader/image_loader_client.js">
// //
// <include src="../../../../webui/resources/js/assert.js">
// <include src="../../../../webui/resources/js/load_time_data.js"> // <include src="../../../../webui/resources/js/load_time_data.js">
// <include src="../../../../webui/resources/js/action_link.js"> // <include src="../../../../webui/resources/js/action_link.js">
// <include src="../../../../webui/resources/js/cr.js"> // <include src="../../../../webui/resources/js/cr.js">
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<link rel="stylesheet" href="../file_manager/foreground/css/file_types.css"> <link rel="stylesheet" href="../file_manager/foreground/css/file_types.css">
<link rel="stylesheet" href="css/gallery.css"> <link rel="stylesheet" href="css/gallery.css">
<script src="chrome://resources/js/assert.js"></script>
<script src="chrome://resources/js/util.js"></script> <script src="chrome://resources/js/util.js"></script>
<link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html"> <link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html">
......
...@@ -78,6 +78,7 @@ ...@@ -78,6 +78,7 @@
"scripts": [ "scripts": [
"chrome://resources/js/cr.js", "chrome://resources/js/cr.js",
"chrome://resources/js/cr/event_target.js", "chrome://resources/js/cr/event_target.js",
"chrome://resources/js/assert.js",
"chrome://resources/js/cr/ui/array_data_model.js", "chrome://resources/js/cr/ui/array_data_model.js",
"chrome://resources/js/load_time_data.js", "chrome://resources/js/load_time_data.js",
"chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj/background/js/background_common_scripts.js", "chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj/background/js/background_common_scripts.js",
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<script src="chrome://resources/js/cr.js"></script> <script src="chrome://resources/js/cr.js"></script>
<script src="chrome://resources/js/cr/event_target.js"></script> <script src="chrome://resources/js/cr/event_target.js"></script>
<script src="chrome://resources/js/assert.js"></script>
<script src="chrome://resources/js/cr/ui/array_data_model.js"></script> <script src="chrome://resources/js/cr/ui/array_data_model.js"></script>
<script src="chrome://resources/js/load_time_data.js"></script> <script src="chrome://resources/js/load_time_data.js"></script>
<script src="chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj/background/js/background_common_scripts.js"></script> <script src="chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj/background/js/background_common_scripts.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