Skip to content

Add extra channel info #1332

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

Merged
merged 1 commit into from
Feb 15, 2021
Merged

Conversation

wchen342
Copy link
Contributor

Add "Ungoogled Chromium" as extra channel infomation. Solves #1303.

*nix version is tested on Fedora. Windows version is untested.

@wchen342 wchen342 force-pushed the about-patch branch 2 times, most recently from c258740 to c483b4c Compare January 16, 2021 03:23
Copy link
Member

@Eloston Eloston left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Instead of overriding extra channel info, can we simply append (ungoogled-chromium)?
  2. Alternatively, would it be easier to patch the HTML file as suggested here? "about" (settings/help) should state this is ungoogled cromium #1303 (comment). Or is this not cross-platform enough?

std::string modifier;

- char* env = getenv("CHROME_VERSION_EXTRA");
+ char* env = "Ungoogled Chromium";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would prevent reading the environment variable CHROME_VERSION_EXTRA.

Copy link
Contributor Author

@wchen342 wchen342 Jan 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is what Fedora uses in their chromium package so I just adapted it. Is there any actual a use case for CHROME_VERSION_EXTRA? Although appending shall be possible since the extra info is just a string.

would it be easier to patch the HTML file as suggested

The change here modifies the string shown on both chrome://settings/help and chrome://version at the same time. Editing HTML doesn't have that effect I think.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is what Fedora uses in their chromium package so I just adapted it. Is there any actual a use case for CHROME_VERSION_EXTRA? Although appending shall be possible since the extra info is just a string.

Debian also sets it to indicate the build distribution & running distribution. I don't want to break that behavior.

Actually, could we just set (ungoogled-chromium) only if no extra channel info is provided at all? I don't want to force users to have this string if they don't want it.

return base::UTF16ToASCII(channel);
#else
- return std::string();
+ return std::string("Ungoogled Chromium");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should probably test this on Windows to make sure it won't override the configured channel info.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I cannot compile the WIndows version. Who is the maintainer of Win repo? Maybe he can help testing this.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm maintaining the Windows repo. I can test this for you.

@Ahrotahn
Copy link
Contributor

Ahrotahn commented Feb 8, 2021

An alternative option would be to change "Official Build" in components/version_ui_strings.grdp.

This wouldn't require any platform-specific changes, aligns more with the linked issue, and might clear some confusion in issues with people thinking they are running an 'official' build of ungoogled-chromium.

@wchen342
Copy link
Contributor Author

wchen342 commented Feb 8, 2021

Won't that only apply when is_official_build=true is set? Otherwise you will see the string "Developer Build".

@Ahrotahn
Copy link
Contributor

Ahrotahn commented Feb 8, 2021

That's true! I guess "Developer Build" could also be changed. Maybe have them named something like "ungoogled-chromium release build/ungoogled-chromium dev build"?

@wchen342
Copy link
Contributor Author

wchen342 commented Feb 8, 2021

Yeah that can be a good idea. What does @Eloston think?

@Eloston
Copy link
Member

Eloston commented Feb 15, 2021

Sure, I don't mind changing the (Developer Build) and (Release Build) strings. Maybe even simply appending a string like Developer Build, ungoogled-chromium to not deviate too far from the existing format.

@wchen342
Copy link
Contributor Author

The patch has been updated to append , ungoogled-chromium to the two strings. Since it now only changes the string literals there shouldn't be any problem.

@wchen342 wchen342 requested a review from Eloston February 15, 2021 22:01
Copy link
Member

@Eloston Eloston left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, Thanks 👍

@Eloston Eloston merged commit dc7794d into ungoogled-software:master Feb 15, 2021
@Eloston Eloston added this to the 88.x.x.x milestone Feb 15, 2021
@wchen342 wchen342 deleted the about-patch branch February 19, 2021 20:29
This was referenced Oct 18, 2021
@PF4Public PF4Public mentioned this pull request Jul 11, 2023
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants