From d1adba09a62fd9417225c617c9fc00561b3b5a8f Mon Sep 17 00:00:00 2001
From: Jeremy Rose <nornagon@nornagon.net>
Date: Mon, 5 Oct 2020 15:02:51 -0700
Subject: [PATCH 1/2] fix: sync devtools frontend mime types with upstream

---
 shell/browser/ui/devtools_ui.cc | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/shell/browser/ui/devtools_ui.cc b/shell/browser/ui/devtools_ui.cc
index 201c43f51e9aa..3d7995038959b 100644
--- a/shell/browser/ui/devtools_ui.cc
+++ b/shell/browser/ui/devtools_ui.cc
@@ -22,7 +22,12 @@ namespace electron {
 namespace {
 
 std::string PathWithoutParams(const std::string& path) {
-  return GURL(std::string("devtools://devtools/") + path).path().substr(1);
+  return GURL(base::StrCat({content::kChromeDevToolsScheme,
+                            url::kStandardSchemeSeparator,
+                            chrome::kChromeUIDevToolsHost}))
+      .Resolve(path)
+      .path()
+      .substr(1);
 }
 
 std::string GetMimeTypeForPath(const std::string& path) {
@@ -33,11 +38,19 @@ std::string GetMimeTypeForPath(const std::string& path) {
                             base::CompareCase::INSENSITIVE_ASCII)) {
     return "text/css";
   } else if (base::EndsWith(filename, ".js",
+                            base::CompareCase::INSENSITIVE_ASCII) ||
+             base::EndsWith(filename, ".mjs",
                             base::CompareCase::INSENSITIVE_ASCII)) {
     return "application/javascript";
   } else if (base::EndsWith(filename, ".png",
                             base::CompareCase::INSENSITIVE_ASCII)) {
     return "image/png";
+  } else if (base::EndsWith(filename, ".map",
+                            base::CompareCase::INSENSITIVE_ASCII)) {
+    return "application/json";
+  } else if (base::EndsWith(filename, ".ts",
+                            base::CompareCase::INSENSITIVE_ASCII)) {
+    return "application/x-typescript";
   } else if (base::EndsWith(filename, ".gif",
                             base::CompareCase::INSENSITIVE_ASCII)) {
     return "image/gif";

From 22729c6d805d2d9ab14d6035f9f58c503e8cdfef Mon Sep 17 00:00:00 2001
From: Jeremy Rose <nornagon@nornagon.net>
Date: Tue, 6 Oct 2020 14:36:15 -0700
Subject: [PATCH 2/2] fix header

---
 shell/browser/ui/devtools_ui.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shell/browser/ui/devtools_ui.cc b/shell/browser/ui/devtools_ui.cc
index 3d7995038959b..f3b0ca6fe7427 100644
--- a/shell/browser/ui/devtools_ui.cc
+++ b/shell/browser/ui/devtools_ui.cc
@@ -9,6 +9,7 @@
 #include <utility>
 
 #include "base/memory/ref_counted_memory.h"
+#include "base/strings/strcat.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/common/webui_url_constants.h"