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

Upgrade from Chromium 121.0.6167.57 to Chromium 121.0.6167.75. #21600

Merged
merged 5 commits into from
Jan 18, 2024

Conversation

mkarolin
Copy link
Collaborator

Resolves brave/brave-browser#35382

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 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:

@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 Jan 17, 2024
@mkarolin mkarolin self-assigned this Jan 17, 2024
@mkarolin mkarolin requested review from a team as code owners January 17, 2024 19:46
Chromium change:

https://source.chromium.org/chromium/chromium/src/+/60a77feece4d7af84fcbdd929827a45b75852b04

commit 60a77feece4d7af84fcbdd929827a45b75852b04
Author: Emily Shack <[email protected]>
Date:   Fri Jan 12 04:20:08 2024 +0000

    Tab Organization: Ensure tabs switch appropriately

    Adds a pref observer such that when the tab search tab index pref
    changes from outside the bubble, the bubble listens for that change and
    updates accordingly. Then, also explicitly sets the pref to show the tab
    search tab when the tab search keyboard shortcut is triggered.

    This addresses a couple bugs, one where the tab search keyboard shortcut
    might open to the tab organization tab, and the other where opening the
    bubble to tab search -> closing the bubble -> using any entry point
    other than the tab search button to open tab organization would open to
    the tab search tab.

    an exception for tab_search_page_handler.cc.

    Low-Coverage-Reason: HARD_TO_TEST. Test launch review team has granted
    Bug: 1469126
Copy link
Contributor

[puLL-Merge] - brave/brave-core@21600

Description

This PR introduces various text and UI-related updates in Brave's New Tab Page and other parts of the browser interface. These changes include adding tool-tips, improving accessibility labels, and updating messages related to AI-generated themes and tab organization features. There is also a version bump for the underlying Chromium engine, and several additions and changes to resource files.

Changes

Changes

app/generated_resources.grd

  • Added new messages for color hue slider delete button in IDS_NTP_CUSTOMIZE_COLOR_HUE_SLIDER_DELETE_TITLE and IDS_NTP_CUSTOMIZE_COLOR_HUE_SLIDER_DELETE_A11Y_LABEL.
  • Updated accessibility labels for wallpaper search history results with various descriptors.
  • Removed message IDS_NTP_WALLPAPER_SEARCH_HISTORY_TILE_TITLE.
  • Added messages for unselecting a subject, mood, and style in wallpaper search.
  • Added messages for loading and success states in AI-generated wallaper search.
  • Removed some obsolete messages and added descriptions and titles for various AI features.

app/settings_strings.grdp

  • Minor text update: changed "Tab Organizer" to "Tab organizer".

browser/ui/views/brave_tab_search_bubble_host.(cc|h)

  • Modified ShowTabSearchBubble to accept an additional tab_index parameter.

chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc

  • Updated timestamp and pins list for certificates.

components/site_settings_strings.grdp

  • Added new entries related to site performance settings.

package.json

  • Updated Chromium tag version from 121.0.6167.57 to 121.0.6167.75.

patches/*

  • The patches seem to be updates to existing patch files. It would require reviewing the Brave codebase to understand the context and necessity of these patches.

Security Hotspots

  • chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc: Changes in certificates and timestamp need to be carefully reviewed to ensure no unauthorized or rogue certificates are being introduced.
  • package.json: Since this PR updates the underlying Chromium engine version, it is crucial to review the Chromium change logs for any security-related updates or patches that have been included.
  • patches/: Patches that modify the core functionality, UI components, or web APIs can introduce new security vulnerabilities if not reviewed properly. Each patch should be analyzed to make sure it doesn't weaken the browser's existing security measures.

It's important to ensure all new strings or changes to existing strings do not introduce possibilities for injection attacks (such as script injection in web UI components) and comply with any localization requirements. Additionally, the updates in accessibility-related messages should maintain clear and accurate descriptions to avoid any confusion or misuse.

@mkarolin mkarolin merged commit b78494c into master Jan 18, 2024
18 checks passed
@mkarolin mkarolin deleted the 121.0.6167.75_master branch January 18, 2024 18:04
@github-actions github-actions bot added this to the 1.64.x - Nightly milestone Jan 18, 2024
mkarolin added a commit that referenced this pull request Jan 18, 2024
Upgrade from Chromium 121.0.6167.57 to Chromium 121.0.6167.75.
kjozwiak pushed a commit that referenced this pull request Jan 20, 2024
* Merge pull request #21134 from brave/cr121

Upgrade from Chromium 120 to Chromium 121.

* Remove the assert for patch_ffmpeg.py (#21184)

* Merge pull request #21539 from brave/ffmpeg-dynamic-alloc

Use dynamic allocation for ffmpeg fft tables on Windows.

* Merge pull request #21585 from brave/issues/35318

Remove dynamic allocation of ffmpeg ff_tx tables.

* Disables a flaky upstream browser test.

* Merge pull request #21584 from brave/fix_new_tab_button_plus_misaligned

Fixed new tab button's plus icon is mis-aligned with horizontal tab

* Merge pull request #21600 from brave/121.0.6167.75_master

Upgrade from Chromium 121.0.6167.57 to Chromium 121.0.6167.75.

* Merge pull request #21628 from brave/maxk-disable-reading-mode

Hides `Open in Reading Mode` context menu item.

* [Uplift 1.62.x] AI chat issues cr121 1.62.x (#21629)

* aichat: input is growable (#21124)

* aichat: scroll is interruptable (#21235)

* aichat: model maker text shouldnt look like a link (#21220)

* aichat: code formatting (#21342)

* make claude output formatted code (#21599)

---------

Co-authored-by: Mikhail <[email protected]>
Co-authored-by: Aleksey Khoroshilov <[email protected]>
Co-authored-by: Simon Hong <[email protected]>
Co-authored-by: taher <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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) puLL-Merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade from Chromium 121.0.6167.57 to Chromium 121.0.6167.75.
2 participants