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

Fixed wrong location bar/omnibox colors are used #13124

Merged
merged 1 commit into from
Apr 22, 2022

Conversation

simonhong
Copy link
Member

@simonhong simonhong commented Apr 22, 2022

fix brave/brave-browser#22479

Screen Shot 2022-04-22 at 12 12 11 PM

This regression comes from below upstream changes.
https://chromium-review.googlesource.com/c/chromium/src/+/3472345

Beforer this change, GetOmniboxColor() is called by ThemeHelper::GetColor()
whereas it's called by ThemeHelper::GetDefaultColor() now.
Then, we get incognito's omnibox color due to our below code at
BraveThemeHelper::GetDefaultColor().

  // Make sure we fallback to Chrome's dark theme (incognito) for our dark theme
  if (type == dark_mode::BraveDarkModeType::BRAVE_DARK_MODE_TYPE_DARK) {
    incognito = true;
  }

  DCHECK(!is_brave_theme_properties);
  return ThemeHelper::GetDefaultColor(id, incognito, theme_supplier);

Fixed by handling omnibox colors before overriding |incognito| var.

Resolves

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

npm run test brave_browser_tests -- --filter=BraveThemeServiceTest.OmniboxColorTest

@simonhong simonhong self-assigned this Apr 22, 2022
@simonhong simonhong force-pushed the fixed_dark_mode_omnibox_colors branch 2 times, most recently from 5a81fd1 to 8eb405e Compare April 22, 2022 03:04
fix brave/brave-browser#22479

This regression comes from below upstream changes.
https://chromium-review.googlesource.com/c/chromium/src/+/3472345

Beforer this change, GetOmniboxColor() is called by ThemeHelper::GetColor()
whereas it's called by ThemeHelper::GetDefaultColor() now.
Then, we get incognito's omnibox color due to our below code at
BraveThemeHelper::GetDefaultColor().
```
  // Make sure we fallback to Chrome's dark theme (incognito) for our dark theme
  if (type == dark_mode::BraveDarkModeType::BRAVE_DARK_MODE_TYPE_DARK) {
    incognito = true;
  }

  DCHECK(!is_brave_theme_properties);
  return ThemeHelper::GetDefaultColor(id, incognito, theme_supplier);
```

Fixed by handling omnibox colors before overriding |incognito| var.
@simonhong simonhong force-pushed the fixed_dark_mode_omnibox_colors branch from 8eb405e to c13dbe0 Compare April 22, 2022 03:04
Copy link
Collaborator

@mkarolin mkarolin left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@simonhong simonhong merged commit cb752c3 into master Apr 22, 2022
@simonhong simonhong deleted the fixed_dark_mode_omnibox_colors branch April 22, 2022 22:43
@simonhong simonhong added this to the 1.40.x - Nightly milestone Apr 22, 2022
brave-builds pushed a commit that referenced this pull request Apr 22, 2022
brave-builds pushed a commit that referenced this pull request Apr 22, 2022
@kjozwiak
Copy link
Member

Reproduced the original issue on Win 11 x64 using the following build(s):

Brave | 1.40.7 Chromium: 101.0.4951.41 (Official Build) nightly (64-bit)
-- | --
Revision | 93c720db8323b3ec10d056025ab95c23a31997c9-refs/branch-heads/4951@{#904}
OS | Windows 11 Version 21H2 (Build 22000.613)

reproduceTheme

Verification PASSED on Win 11 x64 using the following build(s):

Brave | 1.40.8 Chromium: 101.0.4951.41 (Official Build) nightly (64-bit)
-- | --
Revision | 93c720db8323b3ec10d056025ab95c23a31997c9-refs/branch-heads/4951@{#904}
OS | Windows 11 Version 21H2 (Build 22000.613)
Light Theme Dark Theme
image ThemeDark

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

omnibox color/styling is incorrect in dark theme - Chromium 101
3 participants