Commit 644ede26 authored by dpapad's avatar dpapad Committed by Commit Bot

Explicitly pull-in js/assert.js in components/

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/.

Bug: 1143194
Change-Id: I1cb4fec2479d845c9f288cf03215e36cdd029949
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2508131Reviewed-by: default avatarRebekah Potter <rbpotter@chromium.org>
Reviewed-by: default avatarsebsg <sebsg@chromium.org>
Reviewed-by: default avatarMustafa Emre Acer <meacer@chromium.org>
Commit-Queue: dpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#822552}
parent bdfeec5e
......@@ -5,6 +5,7 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<meta charset="utf-8">
<script src="chrome://resources/js/assert.js"></script>
<script src="chrome://resources/js/util.js"></script>
<script src="autofill_and_password_manager_internals.js"></script>
<link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
......
......@@ -10,6 +10,7 @@
injected by web. -->
<script src="chrome://resources/js/ios/web_ui.js"></script>
<script src="chrome://resources/js/assert.js"></script>
<script src="chrome://resources/js/util.js"></script>
<script src="autofill_and_password_manager_internals.js"></script>
<link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
......
......@@ -18,6 +18,7 @@
<link rel="stylesheet" href="crashes.css">
<script src="chrome://resources/js/action_link.js"></script>
<script src="chrome://resources/js/load_time_data.js"></script>
<script src="chrome://resources/js/assert.js"></script>
<script src="chrome://resources/js/util.js"></script>
<script src="strings.js"></script>
<script src="crashes.js"></script>
......
......@@ -19,6 +19,7 @@
<script src="chrome://resources/js/cr.js"></script>
<script src="chrome://resources/js/cr/ui/focus_outline_manager.js"></script>
<script src="chrome://resources/js/assert.js"></script>
<script src="chrome://resources/js/util.js"></script>
<script src="chrome://resources/js/load_time_data.js"></script>
<script src="strings.js"></script>
......
......@@ -17,6 +17,7 @@
<script src="chrome://resources/js/cr.js"></script>
<script src="chrome://resources/js/load_time_data.js"></script>
<script src="chrome://resources/js/cr/ui.js"></script>
<script src="chrome://resources/js/assert.js"></script>
<script src="chrome://resources/js/util.js"></script>
<script src="strings.js"></script>
<script src="gcm_internals.js"></script>
......
......@@ -9,6 +9,7 @@
<!-- TODO(crbug.com/487000): Remove this once injected by web. -->
<script src="chrome://resources/js/ios/web_ui.js"></script>
<script src="chrome://resources/js/load_time_data.js"></script>
<script src="chrome://resources/js/assert.js"></script>
<script src="chrome://resources/js/util.js"></script>
<script src="strings.js"></script>
<script src="management.js"></script>
......@@ -37,4 +38,4 @@
<div id="unmanaged-info" class="hidden">$i18n{unmanagedInfo}</div>
</div>
</body>
</html>
\ No newline at end of file
</html>
......@@ -11,6 +11,7 @@
<script src="chrome://resources/js/ios/web_ui.js"></script>
</if>
<script src="chrome://resources/js/assert.js"></script>
<script src="chrome://resources/js/util.js"></script>
<script src="chrome://resources/js/cr.js"></script>
<script src="chrome://net-export/net_export.js"></script>
......
......@@ -17,6 +17,7 @@ found in the LICENSE file.
<script src="chrome://resources/js/cr.js"></script>
<script src="chrome://resources/js/jstemplate_compiled.js"></script>
<script src="chrome://resources/js/load_time_data.js"></script>
<script src="chrome://resources/js/assert.js"></script>
<script src="chrome://resources/js/util.js"></script>
<if expr="is_ios">
<!-- TODO(crbug.com/487000): Remove this once injected by web. -->
......
......@@ -18,6 +18,7 @@
<script src="chrome://resources/js/cr/ui.js"></script>
<script src="chrome://resources/js/cr/ui/focus_outline_manager.js"></script>
<script src="chrome://resources/js/load_time_data.js"></script>
<script src="chrome://resources/js/assert.js"></script>
<script src="chrome://resources/js/util.js"></script>
</head>
......
......@@ -6,6 +6,7 @@
<link rel="stylesheet" href="safe_browsing.css">
<link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
<link rel="stylesheet" href="chrome://resources/css/tabs.css">
<script src="chrome://resources/js/assert.js"></script>
<script src="chrome://resources/js/promise_resolver.js"></script>
<script src="chrome://resources/js/cr.js"></script>
<script src="chrome://resources/js/util.js"></script>
......
......@@ -10,6 +10,7 @@
<link rel="stylesheet" href="connection_help.css">
<script src="chrome://resources/js/cr.js"></script>
<script src="chrome://resources/js/load_time_data.js"></script>
<script src="chrome://resources/js/assert.js"></script>
<script src="chrome://resources/js/util.js"></script>
<script src="strings.js"></script>
<script src="connection_help.js"></script>
......
......@@ -16,6 +16,7 @@
<link rel="stylesheet" href="interstitial_lookalikeurl.css">
<link rel="stylesheet" href="interstitial_safebrowsing.css">
<link rel="stylesheet" href="interstitial_ssl.css">
<script src="../../../../../ui/webui/resources/js/assert.js"></script>
<script src="../../../../../ui/webui/resources/js/util.js"></script>
<script src="captive_portal.js"></script>
<script src="ssl.js"></script>
......
......@@ -9,6 +9,7 @@
<title>$i18n{tabTitle}</title>
<link rel="stylesheet" href="../../common/resources/interstitial_core.css">
<link rel="stylesheet" href="interstitial_webview_quiet.css">
<script src="../../../../../ui/webui/resources/js/assert.js"></script>
<script src="../../../../../ui/webui/resources/js/util.js"></script>
<script src="../../common/resources/interstitial_common.js"></script>
<script src="interstitial_webview_quiet.js"></script>
......
......@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<script src="chrome://resources/js/cr.js"></script>
<script src="chrome://resources/js/assert.js"></script>
<script src="chrome://resources/js/util.js"></script>
<script src="chrome://resources/js/load_time_data.js"></script>
<script src="strings.js"></script>
......
......@@ -30,6 +30,7 @@ chrome/test/functional/special_tabs.py. -->
<script src="chrome://resources/js/load_time_data.js"></script>
<!-- List stuff. -->
<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/list_item.js"></script>
<script src="chrome://resources/js/cr/ui/list_selection_controller.js"></script>
......
......@@ -15,6 +15,7 @@ found in the LICENSE file.
<!-- TODO(crbug.com/487000): Remove this once injected by web. -->
<script src="chrome://resources/js/ios/web_ui.js"></script>
</if>
<script src="chrome://resources/js/assert.js"></script>
<script src="chrome://resources/js/util.js"></script>
<script src="chrome://resources/js/cr.js"></script>
<script src="chrome://resources/js/cr/event_target.js"></script>
......
......@@ -5,6 +5,7 @@
<html lang="en">
<meta charset="utf-8">
<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/util.js"></script>
<if expr="is_ios">
......
......@@ -6,6 +6,7 @@
<link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
<link rel="stylesheet" href="user_actions.css">
<script src="chrome://resources/js/cr.js"></script>
<script src="chrome://resources/js/assert.js"></script>
<script src="chrome://resources/js/util.js"></script>
<script src="user_actions.js"></script>
</head>
......
......@@ -26,6 +26,7 @@ about:version template page
<script src="chrome://resources/js/ios/web_ui.js"></script>
</if>
<script src="chrome://resources/js/assert.js"></script>
<script src="chrome://resources/js/promise_resolver.js"></script>
<script src="chrome://resources/js/cr.js"></script>
<script src="chrome://resources/js/load_time_data.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