Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: sync devtools frontend mime types with upstream #27102

Merged
merged 2 commits into from Dec 22, 2020
Merged

fix: sync devtools frontend mime types with upstream #27102

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1adba0
fix: sync devtools frontend mime types with upstream
nornagon Oct 5, 2020
22729c6
fix header
nornagon Oct 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 15 additions & 1 deletion shell/browser/ui/devtools_ui.cc
View file
Open in desktop
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