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 96.0.4664.27 to Chromium 96.0.4664.35 #10861

Merged
merged 4 commits into from
Nov 4, 2021

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented Nov 3, 2021

Fixes brave/brave-browser#19215
Related PR: brave/brave-browser#19216

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

samartnik and others added 2 commits November 3, 2021 20:23
…anager

Chromium change:
chromium/chromium@d35392a

[Start] Recreate CTA if homepage settings changes Start surface state.
When homepage is enabled/disabled or chrome's homepage URI is changed,
Start surface may be switched from enabled to disabled or vice verse.
When the state is switched, it may require to create StartSurface and
the toolbar. Recreate ChromeTabbedActivity to adopt the changes.
Additionally, tab reparenting are handled here.

Demo:
https://drive.google.com/file/d/1bQccNFPcbeTsDADbYdat0Epwql9PpV1c/view?usp=sharing

(cherry picked from commit d291ab2)

Bug: 1258206
Fixes

20:02:09  In file included from ../../brave/browser/notifications/ads_notification_handler.cc:10:
20:02:09  In file included from ../../brave/browser/brave_ads/ads_service_factory.h:12:
20:02:09  ../../brave/components/brave_ads/browser/ads_service.h:17:10: fatal error: 'brave/vendor/bat-native-ads/include/bat/ads/public/interfaces/ads.mojom.h' file not found
20:02:09  #include "brave/vendor/bat-native-ads/include/bat/ads/public/interfaces/ads.mojom.h"
20:02:09           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
20:02:09  1 error generated.
@bbondy bbondy merged commit 201283f into master Nov 4, 2021
@bbondy bbondy deleted the 96.0.4664.35_master_130 branch November 4, 2021 15:07
@bbondy bbondy added this to the 1.33.x - Nightly milestone Nov 4, 2021
mkarolin pushed a commit that referenced this pull request Nov 4, 2021
Upgrade from Chromium 96.0.4664.27 to Chromium 96.0.4664.35
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.

Upgrade from Chromium 96.0.4664.27 to Chromium 96.0.4664.35.
3 participants