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

Do not removed shields settings with empty primary pattern. #27819

Merged
merged 1 commit into from
Feb 28, 2025

Conversation

boocmp
Copy link
Contributor

@boocmp boocmp commented Feb 26, 2025

Resolves brave/brave-browser#28319

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • 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 wiki
    • npm run presubmit wiki, 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:

@boocmp boocmp self-assigned this Feb 26, 2025
@boocmp boocmp requested a review from a team as a code owner February 26, 2025 14:58
@boocmp boocmp requested review from a team as code owners February 27, 2025 00:45
@boocmp boocmp requested a review from ShivanKaul February 27, 2025 01:05
@ShivanKaul
Copy link
Collaborator

Maybe we can do a follow-up to move the default value for Shields settings to be a profile pref instead

@boocmp boocmp requested a review from goodov February 27, 2025 01:16
@boocmp boocmp force-pushed the issues/28319 branch 2 times, most recently from 4c070b3 to 111e6b9 Compare February 27, 2025 12:51
raw_ptr<Profile> profile_ = nullptr;
base::flat_map<ContentSettingsType, std::vector<ContentSettingPatternSource>>
defaults_;
};
Copy link
Member

@goodov goodov Feb 28, 2025

Choose a reason for hiding this comment

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

Looks a bit questionable. Is this the right fix here? Shouldn't we instead migrate those bogus rules in content settings and let the cleanup logic work as intended?

Copy link
Member

Choose a reason for hiding this comment

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

ah, this is what @ShivanKaul said above.

I guess we can have this PR as a quick workaround for the really annoying problem, but we should eventually fix this and store the default state in pref.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@boocmp boocmp merged commit 32c4ca7 into master Feb 28, 2025
20 checks passed
@boocmp boocmp deleted the issues/28319 branch February 28, 2025 10:33
@github-actions github-actions bot added this to the 1.78.x - Nightly milestone Feb 28, 2025
@brave-builds
Copy link
Collaborator

Released in v1.78.6

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants