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

Updated patches from Chromium 87.0.4280.47 to Chromium 87.0.4280.49. #7061

Merged
merged 3 commits into from
Nov 5, 2020

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented Nov 5, 2020

Fixes brave/brave-browser#12527
Related PR: brave/brave-browser#12528

Submitter Checklist:

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

After-merge Checklist:

  • The associated issue milestone is set to the smallest version that the
    changes has landed on.
  • All relevant documentation has been updated.

Copy link
Member

@bsclifton bsclifton left a comment

Choose a reason for hiding this comment

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

++

Chromium change:

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

commit af7309559feae76c9f3368006c80f1290454c46a
Author: Yue Zhang <yuezhanggg@chromium.org>
Date:   Tue Nov 3 18:08:16 2020 +0000

    Hide tab strip when omnibox has focus

    Since TabGridDialog and omnibox both use the ScrimView from
    RootUiCoordinator, there will be a conflict when user try to open
    dialog from tab strip when omnibox is focused. This CL fixes this issue
    by suppressing tab strip when omnibox is focused and restoring
    visibility when omnibox loses focus.

    (cherry picked from commit 6630c45c96c137a767cbe345d34b61d3bd65cd79)

    Bug: 1096358
@mkarolin mkarolin added CI/skip-ios Do not run CI builds for iOS CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 labels Nov 5, 2020
@mkarolin
Copy link
Collaborator Author

mkarolin commented Nov 5, 2020

A known CI failure on Windows (RewardsContributionBrowserTest.RecurringTipForUnverifiedPublisher).

Build failure on Android.

@mkarolin
Copy link
Collaborator Author

mkarolin commented Nov 5, 2020

@samartnik, could you please review the Android change: ef402fd

@mkarolin
Copy link
Collaborator Author

mkarolin commented Nov 5, 2020

@samartnik, pushed a change to remove the bytecode patching.

Copy link
Contributor

@samartnik samartnik left a comment

Choose a reason for hiding this comment

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

lgtm

@mkarolin
Copy link
Collaborator Author

mkarolin commented Nov 5, 2020

Android passed CI.

@bsclifton bsclifton merged commit 10dc7a2 into master Nov 5, 2020
@bsclifton bsclifton deleted the 87.0.4280.49 branch November 5, 2020 18:23
@mkarolin mkarolin added this to the 1.18.x - Nightly milestone Nov 5, 2020
mkarolin pushed a commit that referenced this pull request Nov 7, 2020
Updated patches from Chromium 87.0.4280.47 to Chromium 87.0.4280.49.
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 CI/skip-ios Do not run CI builds for iOS CI/skip-macos-x64 Do not run CI builds for macOS x64
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade from Chromium 87.0.4280.47 to Chromium 87.0.4280.49.
3 participants