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

Hide third-party cookies toggle from Cookies and Site Data popup #18550

Merged

Conversation

emerick
Copy link
Contributor

@emerick emerick commented May 19, 2023

Now that the PageSpecificSiteDataDialog is enabled by default, we want to use it but we need to remove the "Block third-party cookies" toggle.

Resolves brave/brave-browser#30396

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 wiki
    • npm run lint, 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:

@emerick emerick requested a review from a team as a code owner May 19, 2023 15:26
@emerick emerick self-assigned this May 19, 2023
@emerick emerick requested a review from a team as a code owner May 19, 2023 15:26
@emerick emerick force-pushed the cr114-followup-remove-cookies-toggle-from-site-data-popup branch from 8d0e9d4 to 86f1a08 Compare May 19, 2023 16:59
@emerick emerick force-pushed the cr114-followup-remove-cookies-toggle-from-site-data-popup branch from 86f1a08 to d085c76 Compare May 19, 2023 20:10
NOTREACHED_NORETURN();
}

+ BRAVE_HIDE_COOKIES_BLOCK_CONTROL
Copy link
Collaborator

Choose a reason for hiding this comment

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

can't we just disable kPageInfoCookiesSubpage?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated to disable kPageInfoCookiesSubpage.

@emerick emerick force-pushed the cr114-followup-remove-cookies-toggle-from-site-data-popup branch 4 times, most recently from 9088267 to 2b87a43 Compare May 22, 2023 11:16
@emerick emerick requested a review from bridiver May 22, 2023 12:50
Now that the PageSpecificSiteDataDialog is enabled by default, we want to use it
but we need to remove the "Block third-party cookies" toggle.

Chromium change:

https://source.chromium.org/chromium/chromium/src/+/261c8555a61041682df175ac5914588ec39e765a

commit 261c8555a61041682df175ac5914588ec39e765a
Author: Olesia Marukhno <olesiamarukhno@google.com>
Date:   Wed Apr 5 12:06:09 2023 +0000

    [site data] Enable PageSpecificSiteDataDialog by default

    Bug: 1344787
@emerick emerick force-pushed the cr114-followup-remove-cookies-toggle-from-site-data-popup branch from 2b87a43 to bec4baa Compare May 23, 2023 22:00
@emerick emerick merged commit 10b2d6d into master May 24, 2023
@emerick emerick deleted the cr114-followup-remove-cookies-toggle-from-site-data-popup branch May 24, 2023 11:06
@emerick emerick added this to the 1.54.x - Nightly milestone May 24, 2023
@github-actions github-actions bot added the CI/run-network-audit Run network-audit label May 24, 2023
emerick added a commit that referenced this pull request May 24, 2023
…ggle-from-site-data-popup

Hide third-party cookies toggle from Cookies and Site Data popup
emerick added a commit that referenced this pull request May 24, 2023
…ggle-from-site-data-popup

Hide third-party cookies toggle from Cookies and Site Data popup
@kjozwiak
Copy link
Member

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

Brave | 1.54.4 Chromium: 114.0.5735.35 (Official Build) nightly (64-bit)
-- | --
Revision | 2295354895fa3652ae47b651481831484f16d1ff-refs/branch-heads/5735@{#713}
OS | Windows 11 Version 22H2 (Build 22621.1702)

Using the STR/Cases outlined via brave/brave-browser#30396 (comment), ensured that the Block third-party cookies toggle was removed. Also double checked with @emerick and ensured that the removal of the Cookies and site data popup is also removed.

Clean Install

Example Example
cleanFixed1 cleanFixed2

Upgraded Profile

Example Example
updateFixed1 updateFixed2

kjozwiak pushed a commit that referenced this pull request May 24, 2023
…pup in lock icon (uplift to 1.53.x) (#18598)

Merge pull request #18550 from brave/cr114-followup-remove-cookies-toggle-from-site-data-popup

Hide third-party cookies toggle from Cookies and Site Data popup
kjozwiak pushed a commit that referenced this pull request May 24, 2023
…pup in lock icon (uplift to 1.52.x) (#18599)

Merge pull request #18550 from brave/cr114-followup-remove-cookies-toggle-from-site-data-popup

Hide third-party cookies toggle from Cookies and Site Data popup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/run-network-audit Run network-audit
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove Block third-party cookies toggle from Cookies and site data popup in lock icon
4 participants