Skip to content

Commit

Permalink
fix: sync devtools frontend mime types with upstream (#27102)
Browse files Browse the repository at this point in the history
* fix: sync devtools frontend mime types with upstream

* fix header

Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
  • Loading branch information
trop[bot] and nornagon committed Dec 22, 2020
1 parent dcd2169 commit c188ed0
Showing 1 changed file with 15 additions and 1 deletion.
16 changes: 15 additions & 1 deletion shell/browser/ui/devtools_ui.cc
Expand Up @@ -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"
Expand All @@ -22,7 +23,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) {
Expand All @@ -33,11 +39,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";
Expand Down

0 comments on commit c188ed0

Please sign in to comment.