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

Move Flash default to ContentSettingsRegistry #700

Merged
merged 1 commit into from
Oct 22, 2018
Merged

Conversation

pilgrim-brave
Copy link
Contributor

Fixes brave/brave-browser#1727

Second attempt at this in light of these comments: #653 (comment)

UI flow is now exactly as described in #116

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Verified that these changes build without errors on
    • Windows
    • macOS
    • Linux
  • Verified that these changes pass automated tests (npm test brave_unit_tests && npm test brave_browser_tests) on
    • Windows
    • macOS
    • Linux
  • Ran git rebase master (if needed).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed.
  • Add appropriate QA labels (QA/Yes or QA/No) to include the closed issue in milestone

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

@pilgrim-brave pilgrim-brave self-assigned this Oct 19, 2018
Copy link
Member

@yrliou yrliou left a comment

Choose a reason for hiding this comment

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

LGTM

@bbondy bbondy merged commit 8a70db5 into master Oct 22, 2018
bbondy added a commit that referenced this pull request Oct 22, 2018
Move Flash default to ContentSettingsRegistry
bbondy added a commit that referenced this pull request Oct 22, 2018
Move Flash default to ContentSettingsRegistry
@bbondy
Copy link
Member

bbondy commented Oct 22, 2018

master: 8a70db5
0.57.x: d2573fc
0.56.x: 549685e

@bsclifton bsclifton deleted the mpilgrim_flash_2 branch November 5, 2018 18:49
@bbondy bbondy added this to the 0.56.x - Release milestone Jan 14, 2019
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.

Flash not properly blocked after clearing browser data
3 participants