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

[cr133 follow up] Hide cookies row on Settings' privacy page. #27372

Merged
merged 1 commit into from
Jan 28, 2025
Merged

[cr133 follow up] Hide cookies row on Settings' privacy page. #27372

merged 1 commit into from
Jan 28, 2025

Conversation

mkarolin
Copy link
Collaborator

Resolves brave/brave-browser#43528

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:

@mkarolin mkarolin requested a review from emerick January 28, 2025 15:08
@mkarolin mkarolin self-assigned this Jan 28, 2025
@github-actions github-actions bot added the CI/storybook-url Deploy storybook and provide a unique URL for each build label Jan 28, 2025
@brave-builds
Copy link
Collaborator

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

@mkarolin mkarolin merged commit 752bfd8 into master Jan 28, 2025
19 checks passed
@mkarolin mkarolin deleted the maxk-hide-settings-cookies-row branch January 28, 2025 19:19
@github-actions github-actions bot added this to the 1.76.x - Nightly milestone Jan 28, 2025
mkarolin added a commit that referenced this pull request Jan 28, 2025
@mkarolin
Merge pull request #27372 from brave/maxk-hide-settings-cookies-row
1d91e77 
[cr133 follow up] Hide cookies row on Settings' privacy page.
mkarolin added a commit that referenced this pull request Jan 28, 2025
@mkarolin
Merge pull request #27372 from brave/maxk-hide-settings-cookies-row
b379b7b 
[cr133 follow up] Hide cookies row on Settings' privacy page.
@mkarolin mkarolin mentioned this pull request Jan 28, 2025
Merged
24 tasks
@brave-builds
Copy link
Collaborator

Released in v1.76.44

mkarolin added a commit that referenced this pull request Jan 29, 2025
@mkarolin
Merge pull request #27372 from brave/maxk-hide-settings-cookies-row
ec55196 
[cr133 follow up] Hide cookies row on Settings' privacy page.
kjozwiak pushed a commit that referenced this pull request Jan 30, 2025
@mkarolin @bridiver
@samartnik @kylehickinson
Upgrade from Chromium 132 to Chromium 133 (1.75.x) (#27365)
330f5fa 
* Merge pull request #26537 from brave/cr133

Upgrade from Chromium 132 to Chromium 133.

* [cr133][1.75.x] base::make_span was removed.

All uses of `base::make_span` can be just `span{}`.

Chromium change:
https://chromium-review.googlesource.com/c/chromium/src/+/6066402

commit b394ea77c33ed427269ad91712467c2da6e12e7e
Author: Peter Kasting <pkasting@chromium.org>
Date:   Tue Dec 3 23:04:42 2024 +0000

    Remove make_span.

    This is no longer used.

    Bug: 341907909

* [cr133][1.75.x] Avoid TabHandle refactor

Chromium change:
https://chromium.googlesource.com/chromium/src/+/936ba32422c40d955ab2e1f77a41eea870e1170c

commit 936ba32422c40d955ab2e1f77a41eea870e1170c
Author: Taylor Bergquist <tbergquist@chromium.org>
Date:   Wed Nov 13 19:10:18 2024 +0000

    Clean up TabHandle usage.

    TabHandle should only be used when there is a possibility the tab might
    be closed during the lifetime of the handle. This wasn't true of most
    uses; switch those over to TabInterface*. This will make it easier to
    move TabHandle over to TabInterface.

    This CL also includes some cleanup in TabStripModel, removing some
    TabHandle convenience methods and switching use of TabModel methods to
    the TabInterface equivalents. Some of it is a bit forward looking - the
    next CL will remove some of those TabModel only methods.

    The CL also includes a small cleanup in TabInterface::MaybeGetFromHandle
    so it resolves TabHandle IDs in the normal way (no behavior change).

    Bug: 376752361

* also patch cxx crate from https://github.com/brave/brave-core/commit/… (#27185)

also patch cxx crate from a22fc31
Change presubmit patch empty line to error to allow upstream patches that do not comply with Brave patching standards

* Merge pull request #27359 from brave/maxk-disable-kOneTimePermission

[cr133 follow up] Disables kOneTimePermission permissions feature.

* Merge pull request #27372 from brave/maxk-hide-settings-cookies-row

[cr133 follow up] Hide cookies row on Settings' privacy page.

* [Android] Clean up modern_grey colors for 1.75.x

Chromium change:
https://chromium.googlesource.com/chromium/src/+/e99dac41a65779af4bfb8a15cde443478f51cc2f

[clank-q4-fixit] Clean up modern_grey colors pt 2

Bug: 40910276

* Merge pull request #27373 from brave/ios-cr133-private-mode-crash

[iOS] Pass in correct browser when creating sync tabs

* Merge pull request #27378 from brave/ios-cr133-profile-creation-fix

[iOS] Use original initial profile name for main profile creation

* Merge pull request #27371 from brave/maxk-cr133-upstream-memory-pressure-fix

[cr133 upstream fix] Fix Prevent Hang in Memory Pressure Calculation …

* Merge pull request #27402 from brave/maxk-disable-history-embeddings

[cr133 follow up] Disables history embeddings features.

* Merge pull request #27394 from brave/133.0.6943.39_master

Upgrade from Chromium 133.0.6943.27 to Chromium 133.0.6943.39.

---------

Co-authored-by: Brian Johnson <34129+bridiver@users.noreply.github.com>
Co-authored-by: Artem Samoilenko <artem@brave.com>
Co-authored-by: Kyle Hickinson <kylehickinson@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emerick emerick emerick approved these changes

Assignees

@mkarolin mkarolin

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

Successfully merging this pull request may close these issues.

CR 133- Redundant setting Block cookies inherited from Chrome
3 participants
@mkarolin @brave-builds @emerick