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

Re-hide "Block third-party cookies in Private" option in brave://settings #16942

Merged
merged 1 commit into from
Jan 31, 2023
Merged

Re-hide "Block third-party cookies in Private" option in brave://settings #16942

merged 1 commit into from
Jan 31, 2023

Conversation

emerick
Copy link
Contributor

@emerick emerick commented Jan 31, 2023

Resolves brave/brave-browser#28176

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
Re-hide "Block third-party cookies in Private" option in brave://sett…
8858407 
…ings

Our code to hide this option broke due to it being moved into a different
template.
@emerick emerick requested a review from mkarolin January 31, 2023 20:15
@emerick emerick self-assigned this Jan 31, 2023
@github-actions github-actions bot added the CI/storybook-url Deploy storybook and provide a unique URL for each build label Jan 31, 2023
mkarolin
mkarolin approved these changes Jan 31, 2023
View reviewed changes
Copy link
Collaborator

@mkarolin mkarolin 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

@emerick emerick merged commit f1d8bb4 into master Jan 31, 2023
@emerick emerick deleted the cr110-followup-remove-block-third-party-cookies-in-private branch January 31, 2023 22:59
@emerick emerick added this to the 1.49.x - Nightly milestone Jan 31, 2023
emerick added a commit that referenced this pull request Jan 31, 2023
@emerick
Merge pull request #16942 from brave/cr110-followup-remove-block-thir…
c36b312 
…d-party-cookies-in-private

Re-hide "Block third-party cookies in Private" option in brave://settings
kjozwiak pushed a commit that referenced this pull request Feb 1, 2023
@emerick @samartnik
@bsclifton @sangwoo108
Upgrade from Chromium 109 to Chromium 110 (1.48.x) (#16884)
b4a3dc4 
* Merge pull request #16324 from brave/cr110

Upgrade from Chromium 109 to Chromium 110

* [Android] Fix for crash or no action on page bookmark

* Merge pull request #16922 from brave/bsc-fix-microtask-crash

Update calls for v8 microscope; skus_js_handler had webview crash

* Fix BraveCompoundTabContainer layout for vertical tab strip (#16885)

In the latest Chromium, CompoundTabContainer doesn't use FlexLayout.
But in our use case, FlexLayout does good so make things work based
on the FlexLayout.

Related upstream changes:
https://chromium-review.googlesource.com/c/chromium/src/+/4081180
https://chromium-review.googlesource.com/c/chromium/src/+/3956548

* Merge pull request #16942 from brave/cr110-followup-remove-block-third-party-cookies-in-private

Re-hide "Block third-party cookies in Private" option in brave://settings

* Merge pull request #16944 from brave/onboarding-bug

Added chrome resource url on onboarding webui csp

* [Android] Fix for search engine logo on NTP

---------

Co-authored-by: Artem Samoilenko <artem@brave.com>
Co-authored-by: Brian Clifton <brian@clifton.me>
Co-authored-by: Sangwoo Ko <sko@brave.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mkarolin mkarolin mkarolin approved these changes

Assignees

@emerick emerick

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

Successfully merging this pull request may close these issues.

[CR 110] remove Block third-party cookies in Private setting
3 participants
@emerick @brave-builds @mkarolin