Merge pull request #6736 from brave/remove-html-imports-from-webui

Remove uses of html imports from WebUI
brave · Sep 30, 2020 · 518ef0f · 518ef0f
2 parents 31e4dbe + 9f04cba
commit 518ef0f
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 10 deletions.
diff --git a/components/brave_adblock_ui/brave_adblock.html b/components/brave_adblock_ui/brave_adblock.html
@@ -5,7 +5,6 @@
 <meta name="viewport" content="width=device-width">
 <title>Ad Block</title>
 <link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
-<link rel="import" href="chrome://resources/html/cr.html">
 <script src="chrome://resources/js/cr.js"></script>
 <script src="chrome://resources/js/load_time_data.js"></script>
 <script src="chrome://resources/js/util.js"></script>

diff --git a/components/brave_rewards/resources/android_page/brave_rewards_page.html b/components/brave_rewards/resources/android_page/brave_rewards_page.html
@@ -5,7 +5,6 @@
 <meta name="viewport" content="width=device-width, user-scalable=0">
 <title>Brave Rewards™</title>
 <link rel="shortcut icon" href="chrome://rewards/favicon.ico" type="image/x-icon">
-<link rel="import" href="chrome://resources/html/cr.html">
 <script src="chrome://resources/js/cr.js"></script>
 <script src="chrome://resources/js/load_time_data.js"></script>
 <script src="chrome://resources/js/util.js"></script>

diff --git a/components/brave_rewards/resources/internals/brave_rewards_internals.html b/components/brave_rewards/resources/internals/brave_rewards_internals.html
@@ -5,7 +5,6 @@
   <meta name="viewport" content="width=device-width">
   <title>Rewards Internals</title>
   <link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
-  <link rel="import" href="chrome://resources/html/cr.html">
   <script src="chrome://resources/js/cr.js"></script>
   <script src="chrome://resources/js/load_time_data.js"></script>
   <script src="chrome://resources/js/util.js"></script>

diff --git a/components/brave_rewards/resources/page/brave_rewards_page.html b/components/brave_rewards/resources/page/brave_rewards_page.html
@@ -5,14 +5,13 @@
 <meta name="viewport" content="width=device-width">
 <title>Rewards</title>
 <link rel="shortcut icon" href="chrome://rewards/favicon.ico" type="image/x-icon">
-<link rel="import" href="chrome://resources/html/cr.html">
 <link rel="stylesheet" href="chrome://resources/css/md_colors.css">
-<link rel="import" href="chrome://brave-resources/br_elements/br_toolbar/br_toolbar.html">
 <script src="chrome://resources/js/cr.js"></script>
 <script src="chrome://resources/js/load_time_data.js"></script>
 <script src="chrome://resources/js/util.js"></script>
 <script src="chrome://resources/js/i18n_template_no_process.js"></script>
 <script src="/brave_rewards_page.bundle.js"></script>
+<script type="module" src="chrome://brave-resources/br_elements/br_toolbar/br_toolbar.m.js"></script>
 <script src="/strings.js"></script>
 <style>
   #root {

diff --git a/components/brave_rewards/resources/tip/brave_rewards_tip.html b/components/brave_rewards/resources/tip/brave_rewards_tip.html
@@ -4,7 +4,6 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width">
   <title>Rewards Tip</title>
-  <link rel="import" href="chrome://resources/html/cr.html">
   <script src="chrome://resources/js/cr.js"></script>
   <script src="chrome://resources/js/load_time_data.js"></script>
   <script src="chrome://resources/js/util.js"></script>

diff --git a/components/brave_wallet_ui/brave_wallet.html b/components/brave_wallet_ui/brave_wallet.html
@@ -4,15 +4,15 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width">
   <title>Crypto Wallets</title>
-  <link rel="import" href="chrome://resources/html/cr.html">
+
   <link rel="stylesheet" href="chrome://resources/css/md_colors.css">
-  <link rel="import" href="chrome://brave-resources/br_elements/br_toolbar/br_toolbar.html">
   <script src="chrome://resources/js/cr.js"></script>
   <script src="chrome://resources/js/load_time_data.js"></script>
   <script src="chrome://resources/js/util.js"></script>
   <script src="chrome://resources/js/i18n_template_no_process.js"></script>
   <script src="/strings.js"></script>
   <script src="/brave_wallet.bundle.js"></script>
+  <script type="module" src="chrome://brave-resources/br_elements/br_toolbar/br_toolbar.m.js"></script>
   <style>
     #root {
       display: flex;

diff --git a/components/ipfs_ui/ipfs.html b/components/ipfs_ui/ipfs.html
@@ -5,7 +5,6 @@
 <meta name="viewport" content="width=device-width">
 <title>IPFS</title>
 <link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
-<link rel="import" href="chrome://resources/html/cr.html">
 <script src="chrome://resources/js/cr.js"></script>
 <script src="chrome://resources/js/load_time_data.js"></script>
 <script src="chrome://resources/js/util.js"></script>

diff --git a/components/webcompat_reporter/ui/webcompat_reporter.html b/components/webcompat_reporter/ui/webcompat_reporter.html
@@ -5,7 +5,6 @@
 <meta name="viewport" content="width=device-width">
 <title>Webcompat Reporter</title>
 <link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
-<link rel="import" href="chrome://resources/html/cr.html">
 <script src="chrome://resources/js/cr.js"></script>
 <script src="chrome://resources/js/load_time_data.js"></script>
 <script src="/webcompat_reporter.bundle.js"></script>