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 phantom de-amp toggle #12694

Merged
merged 3 commits into from
Mar 24, 2022
Merged

Fix phantom de-amp toggle #12694

merged 3 commits into from
Mar 24, 2022

Conversation

ShivanKaul
Copy link
Collaborator

@ShivanKaul ShivanKaul commented Mar 22, 2022

Resolves brave/brave-browser#21788

Put de-amp setting in brave personalization options.

Screenshots:
image
(new setting placement)

image
(no phantom toggle button)

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally: npm run test -- brave_browser_tests, npm run test -- brave_unit_tests, npm run lint, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

@ShivanKaul ShivanKaul requested a review from petemill March 22, 2022 08:39
@ShivanKaul ShivanKaul self-assigned this Mar 22, 2022
@ShivanKaul ShivanKaul added this to the 1.38.x - Nightly milestone Mar 22, 2022
Copy link
Member

@petemill petemill left a comment

Choose a reason for hiding this comment

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

As discussed, we can avoid this template patch / modification entirely by instead placing the amp settings-toggle-button at https://github.com/brave/brave-core/blob/master/browser/resources/settings/brave_privacy_page/brave_personalization_options.html#L56

@ShivanKaul ShivanKaul requested a review from petemill March 22, 2022 22:00
@ShivanKaul
Copy link
Collaborator Author

There's an open issue for the one test failure on Windows: brave/brave-browser#21809, Slack discussion.

@kjozwiak
Copy link
Member

Removing the 1.38.x milestone as this hasn't been completed/merged. At this point, master is on 1.39.x so this will be going into 1.39.x. As per brave/brave-browser#21788 (comment), we'll need to get an uplifted created for 1.38.x.

Copy link
Member

@petemill petemill left a comment

Choose a reason for hiding this comment

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

Great cleanup! Please squash away the other commit before merge.

@@ -68,7 +57,7 @@ RegisterPolymerTemplateModifications({
`)
}
}

Copy link
Member

Choose a reason for hiding this comment

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

remove extra whitespace

@ShivanKaul ShivanKaul merged commit 8c6a99d into master Mar 24, 2022
@ShivanKaul ShivanKaul deleted the bug/de-amp-toggle branch March 24, 2022 01:57
@ShivanKaul ShivanKaul added this to the 1.39.x - Nightly milestone Mar 24, 2022
@ShivanKaul ShivanKaul restored the bug/de-amp-toggle branch March 24, 2022 02:02
brave-builds pushed a commit that referenced this pull request Mar 24, 2022
@kjozwiak
Copy link
Member

Verification PASSED on Win 11 x64 using the following build(s):

Brave | 1.39.2 Chromium: 100.0.4896.46 (Official Build) nightly (64-bit)
-- | --
Revision | 5ca33821b2211805855c77d334353d27c616a7ca-refs/branch-heads/4896@{#584}
OS | Windows 11 Version 21H2 (Build 22000.556)

Verified the STR/Cases outline via https://github.com/brave/brave-browser/issues/21788#issue-1175088211%20&%20https://github.com/brave/brave-browser/issues/21788#issuecomment-1074781639. Also ensured that:

  • enabling/disabling Auto-redirect AMP pages doesn't display any rogue toggles.
Example Example Example Example
amp1 amp2 amp3 amp4

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.

The toggle of Auto-redirect AMP pages is visible inside other pages at brave://settings/privacy
3 participants