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

Removed Adblock item from Browser app menu #13670

Merged
merged 2 commits into from
Jun 10, 2022
Merged

Removed Adblock item from Browser app menu #13670

merged 2 commits into from
Jun 10, 2022

Conversation

nullhook
Copy link
Contributor

@nullhook nullhook commented Jun 7, 2022 •
edited by simonhong
Loading

This PR

  1. removes "Brave Ad block" item from the browser's app menu
  2. replaces the previous Adblock url to the Shields settings content filters url in the new Panel UI
  3. Rewrites brave://adblock contents to brave://settings/shields/content-filters for desktop builds only

Resolves brave/brave-browser#23194

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:

  1. Open Browser app menu to see if "Brave Adblock" item exists
  2. Open the new shields panel > advanced controls > click "Filter lists" ensure it's linked to brave://settings/shields/content-filters
  3. Create a new tab and visit brave://adblock> content should be overridden to the new shields content filters settings page (DESKTOP BUILDS ONLY)

@nullhook nullhook requested a review from simonhong June 7, 2022 20:24
@github-actions github-actions bot added the CI/storybook-url Deploy storybook and provide a unique URL for each build label Jun 7, 2022
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@simonhong
Copy link
Member

Looks good but this change also needs related tests update. - BraveAppMenuBrowserTest.MenuOrderTest

@nullhook nullhook requested a review from petemill June 8, 2022 16:55
@nullhook
Copy link
Contributor Author

nullhook commented Jun 8, 2022

updated BraveAppMenuBrowserTest

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

nullhook
nullhook commented Jun 8, 2022
View reviewed changes
browser/brave_content_browser_client.cc
replacements.SetHostStr(chrome::kChromeUISettingsHost);
replacements.SetPathStr(kContentFiltersPath);
*url = url->ReplaceComponents(replacements);
return false;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

returns false because we want to display original url and not the virtual in the location bar

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@nullhook nullhook requested a review from simonhong June 9, 2022 22:55
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

simonhong
simonhong approved these changes Jun 10, 2022
View reviewed changes
Copy link
Member

@simonhong simonhong left a comment

Choose a reason for hiding this comment

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

++ 👍🏼

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@nullhook nullhook merged commit 91a6dd2 into master Jun 10, 2022
@nullhook nullhook deleted the adblock_removal branch June 10, 2022 06:55
@nullhook nullhook added this to the 1.41.x - Nightly milestone Jun 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petemill petemill petemill approved these changes

@simonhong simonhong simonhong approved these changes

Assignees

@nullhook nullhook

Labels
CI/storybook-url Deploy storybook and provide a unique URL for each build
Projects
None yet
Milestone
1.41.x - Release
Development

Successfully merging this pull request may close these issues.

Adblock redesign follow-up to #8838
4 participants
@nullhook @brave-builds @simonhong @petemill