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

Upgrade from Chromium 124 to Chromium 125 (1.66.x). #23432

Merged
merged 9 commits into from
May 8, 2024
Merged

Upgrade from Chromium 124 to Chromium 125 (1.66.x). #23432

merged 9 commits into from
May 8, 2024

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented May 5, 2024 •
edited
Loading

Resolves brave/brave-browser#37333
Uplift from #22936

Also,
Resolves brave/brave-browser#37366
Uplift from #23049

Resolves brave/brave-browser#37973
Uplift from #23429

Resolves brave/brave-browser#38091
Uplift from #23441

Resolves brave/brave-browser#38152
Uplift from #23497

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 added CI/run-network-audit Run network-audit CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) CI/run-upstream-tests Run upstream unit and browser tests on Linux and Windows (otherwise only on Linux) labels May 5, 2024
@mkarolin mkarolin self-assigned this May 5, 2024
@github-actions github-actions bot added CI/storybook-url Deploy storybook and provide a unique URL for each build feature/web3/wallet feature/web3/wallet/core labels May 5, 2024
mkarolin
mkarolin commented May 5, 2024
View reviewed changes
browser/ui/browser_commands.cc
Comment on lines +699 to +701
auto tab_model = tab_strip_model->DetachTabAtForInsertion(i);
auto contents =
tabs::TabModel::DestroyAndTakeWebContents(std::move(tab_model));
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@sangwoo108 PTAL, thanks!

@brave-builds
Copy link
Collaborator

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

@brave-builds
Copy link
Collaborator

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

@mkarolin mkarolin marked this pull request as ready for review May 6, 2024 13:38
@mkarolin mkarolin requested a review from a team as a code owner May 6, 2024 13:38
@brave-builds
Copy link
Collaborator

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

zenparsing and others added 7 commits May 7, 2024 21:34
@zenparsing @mkarolin
Merge pull request #23049 from brave/ksmith-webui-bubble-mgr
713fff6 
Simplify customization of WebUIBubbleManager
@mkarolin
Merge pull request #22936 from brave/cr125
0661128 
Upgrade from Chromium 124 to Chromium 125.
@mkarolin
NTP drive module was renamed to file suggestion.
beeeb93 
Chromium change:

https://chromium.googlesource.com/chromium/src/+/1af2f445d25a6

commit 1af2f445d25a6f2e12984418df7b9a0bd09d4523
Author: Riley Tatum <rtatum@google.com>
Date:   Mon Apr 8 18:55:34 2024 +0000

    [NTP] Rename drive module to file suggestion for cleaner reuse of code

    This change is helping to prepare for another source for file
    suggestions to be added to the NTP. The other file suggestion source
    will have the same UX; therefore, it would be best to reuse as much code
    as possible.

    Code that can be used across both sources for the module, are changed
    to use the term "file_suggestion" instead of "drive". Code that is
    specific to the Drive source keeps the name "drive". This shouldn't
    change any functionality. It is just meant to make the reuse of this
    code cleaner.

    I left v1 of the module largely alone, since extra source support will
    not be added for the older version of modules .

    Bug: 329897261
@sangwoo108 @mkarolin
Merge pull request #23429 from brave/sko/spt-resurrect
47e6835 
Fix SharedPinnedTab functionality
@mkarolin
TabStripModel::DetachWebContentsAtForInsertion was removed.
8b97208 
Chromium change:

https://source.chromium.org/chromium/chromium/src/+/afdf1e54a8ef45bfd22ecabfea0012da22bba6a3

commit afdf1e54a8ef45bfd22ecabfea0012da22bba6a3
Author: Erik Chen <erikchen@chromium.org>
Date:   Mon Apr 15 20:56:17 2024 +0000

    Remove TabStripModel::DetachWebContentsAtForInsertion.

    This CL is a refactor with no intended behavior change. This CL removes
    callers of DetachWebContentsAtForInsertion. This also allows
    TabModel::RemoveContents to become private.

    Bug: 1476012
@mkarolin
Disables crashing upstream unit tests.
d560004
@mkarolin
Merge pull request #23441 from brave/maxk-fix-bookmarks-folder-color
c7ed67e 
[cr125 follow up] Fixes bookmarks folder color in the side panel.
@brave-builds
Copy link
Collaborator

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

@mkarolin
Merge pull request #23497 from brave/bookmarks_panel_checkboux
7368a5d 
Fixed bookmarks panel checkbox colors
@brave-builds
Copy link
Collaborator

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

@brave-builds
Copy link
Collaborator

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

@kjozwiak kjozwiak added this to the 1.66.x - Beta milestone May 8, 2024
kjozwiak
kjozwiak approved these changes May 8, 2024
View reviewed changes
Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

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

Uplift into 1.66.x approved 👍

@kjozwiak kjozwiak merged commit 65989d9 into 1.66.x May 8, 2024
14 checks passed
@kjozwiak kjozwiak deleted the cr125-1.66.x branch May 8, 2024 18:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kjozwiak kjozwiak kjozwiak approved these changes

Assignees

@mkarolin mkarolin

Labels
CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) CI/run-network-audit Run network-audit CI/run-upstream-tests Run upstream unit and browser tests on Linux and Windows (otherwise only on Linux) CI/storybook-url Deploy storybook and provide a unique URL for each build feature/web3/wallet/core feature/web3/wallet
Projects
None yet
Milestone
1.66.x - Release
Development

Successfully merging this pull request may close these issues.
5 participants
@mkarolin @brave-builds @kjozwiak @zenparsing @sangwoo108