Commit 2c37eec2 authored by Yulun Wu's avatar Yulun Wu Committed by Chromium LUCI CQ

Live updates for search box and suggestion chip colors.

Bug: 1139478
Change-Id: Ie9179fc42d59def83910475e93ef93c5eef3b496
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2622761
Commit-Queue: Yulun Wu <yulunwu@chromium.org>
Reviewed-by: default avatarAlex Newcomer <newcomer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#842688}
parent 92b415d7
...@@ -219,6 +219,13 @@ const char* SearchBoxView::GetClassName() const { ...@@ -219,6 +219,13 @@ const char* SearchBoxView::GetClassName() const {
return "SearchBoxView"; return "SearchBoxView";
} }
void SearchBoxView::OnThemeChanged() {
views::View::OnThemeChanged();
SetupAssistantButton();
SetupCloseButton();
OnWallpaperColorsChanged();
}
// static // static
int SearchBoxView::GetFocusRingSpacing() { int SearchBoxView::GetFocusRingSpacing() {
return kSearchBoxFocusRingWidth + kSearchBoxFocusRingPadding; return kSearchBoxFocusRingWidth + kSearchBoxFocusRingPadding;
......
...@@ -68,6 +68,7 @@ class APP_LIST_EXPORT SearchBoxView : public SearchBoxViewBase, ...@@ -68,6 +68,7 @@ class APP_LIST_EXPORT SearchBoxView : public SearchBoxViewBase,
void GetAccessibleNodeData(ui::AXNodeData* node_data) override; void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
void OnPaintBackground(gfx::Canvas* canvas) override; void OnPaintBackground(gfx::Canvas* canvas) override;
const char* GetClassName() const override; const char* GetClassName() const override;
void OnThemeChanged() override;
// Updates the search box's background corner radius and color based on the // Updates the search box's background corner radius and color based on the
// state of AppListModel. // state of AppListModel.
......
...@@ -145,6 +145,13 @@ bool SearchResultSuggestionChipView::OnKeyPressed(const ui::KeyEvent& event) { ...@@ -145,6 +145,13 @@ bool SearchResultSuggestionChipView::OnKeyPressed(const ui::KeyEvent& event) {
return Button::OnKeyPressed(event); return Button::OnKeyPressed(event);
} }
void SearchResultSuggestionChipView::OnThemeChanged() {
views::View::OnThemeChanged();
text_view_->SetEnabledColor(
AppListColorProvider::Get()->GetSuggestionChipTextColor());
SchedulePaint();
}
std::unique_ptr<views::InkDrop> std::unique_ptr<views::InkDrop>
SearchResultSuggestionChipView::CreateInkDrop() { SearchResultSuggestionChipView::CreateInkDrop() {
std::unique_ptr<views::InkDropImpl> ink_drop = std::unique_ptr<views::InkDropImpl> ink_drop =
......
...@@ -49,6 +49,7 @@ class APP_LIST_EXPORT SearchResultSuggestionChipView ...@@ -49,6 +49,7 @@ class APP_LIST_EXPORT SearchResultSuggestionChipView
void OnFocus() override; void OnFocus() override;
void OnBlur() override; void OnBlur() override;
bool OnKeyPressed(const ui::KeyEvent& event) override; bool OnKeyPressed(const ui::KeyEvent& event) override;
void OnThemeChanged() override;
// views::InkDropHost: // views::InkDropHost:
std::unique_ptr<views::InkDrop> CreateInkDrop() override; std::unique_ptr<views::InkDrop> CreateInkDrop() override;
......
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