Commit e46c3ae5 authored by Peter Kasting's avatar Peter Kasting Committed by Commit Bot

Update keyword view style on theme change.

Without this, changing from e.g. dark to light mode can leave the
keyword text with the wrong color, making it difficult to read.

Bug: 1115452
Change-Id: I982ff9de4cedf79c979ec49bcd08dacfb93738f0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2357676
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Reviewed-by: default avatarTommy Li <tommycli@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#798422}
parent 4c7ff9dd
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include <limits.h> #include <limits.h>
#include <algorithm> // NOLINT #include <algorithm>
#include "base/macros.h" #include "base/macros.h"
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#include "ui/views/controls/button/image_button_factory.h" #include "ui/views/controls/button/image_button_factory.h"
#include "ui/views/controls/focus_ring.h" #include "ui/views/controls/focus_ring.h"
#include "ui/views/controls/highlight_path_generator.h" #include "ui/views/controls/highlight_path_generator.h"
#if defined(OS_WIN) #if defined(OS_WIN)
#include "base/win/atl.h" #include "base/win/atl.h"
#endif #endif
...@@ -214,7 +215,10 @@ void OmniboxResultView::ApplyThemeAndRefreshIcons(bool force_reapply_styles) { ...@@ -214,7 +215,10 @@ void OmniboxResultView::ApplyThemeAndRefreshIcons(bool force_reapply_styles) {
suggestion_view_->description()->ReapplyStyling(); suggestion_view_->description()->ReapplyStyling();
} }
if (keyword_view_->GetVisible()) { if (force_reapply_styles) {
keyword_view_->content()->ReapplyStyling();
keyword_view_->description()->ReapplyStyling();
} else if (keyword_view_->GetVisible()) {
keyword_view_->description()->ApplyTextColor( keyword_view_->description()->ApplyTextColor(
OmniboxPart::RESULTS_TEXT_DIMMED); OmniboxPart::RESULTS_TEXT_DIMMED);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment