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.

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

fix: sync devtools frontend mime types with upstream #25780

Merged
merged 2 commits into from Oct 6, 2020

Conversation

nornagon
Copy link
Member

@nornagon nornagon commented Oct 5, 2020

Description of Change

Fixes #25778.

This updates the function to match
https://source.chromium.org/chromium/chromium/src/+/master:chrome/browser/ui/webui/devtools_ui_data_source.cc;l=52;drc=2de0b2cfe26853bda417346c8a6e6538a06780d8.

Checklist

Release Notes

Notes: Fixed the pretty-print JavaScript feature in DevTools not functioning correctly.

@electron-cation electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label Oct 5, 2020
@codebytere
Copy link
Member

codebytere commented Oct 6, 2020

think you're missing a header:

inlines-hidden -Wno-deprecated-declarations -c ../../electron/shell/browser/ui/devtools_ui.cc -o obj/electron/electron_lib/devtools_ui.o
../../electron/shell/browser/ui/devtools_ui.cc:25:21: error: no member named 'StrCat' in namespace 'base'
  return GURL(base::StrCat({content::kChromeDevToolsScheme,
              ~~~~~~^
1 error generated.

@nornagon
Copy link
Member Author

nornagon commented Oct 6, 2020

whups, fixed locally and forgot to push.

@electron-cation electron-cation bot removed the new-pr 🌱 PR opened in the last 24 hours label Oct 6, 2020
@nornagon nornagon merged commit a5ca25b into master Oct 6, 2020
@release-clerk
Copy link

release-clerk bot commented Oct 6, 2020

Release Notes Persisted

Fixed the pretty-print JavaScript feature in DevTools not functioning correctly.

@nornagon nornagon deleted the fix-devtools-prettyprint branch October 6, 2020 22:59
@MarshallOfSound
Copy link
Member

/trop run backport

@trop
Copy link
Contributor

trop bot commented Dec 21, 2020

The backport process for this PR has been manually initiated, here we go! :D

@trop
Copy link
Contributor

trop bot commented Dec 21, 2020

I have automatically backported this PR to "11-x-y", please check out #27102

imran1008 pushed a commit to bloomberg/chromium.bb that referenced this pull request Dec 22, 2021
Electron had similar issue in its devtools: electron/electron#27103. Electron fixed the issue by adapting changes from Chromium upstream: electron/electron#25780. This PR also adapted upstream changes for adding more mime types support.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Pretty-print JS in devtools doesn't work
3 participants