Commit bdbcd4f2 authored by Mike Wasserman's avatar Mike Wasserman Committed by Commit Bot

NativeFS: Fix the toggle button's color in the usage bubble

The bubble was passing the desired icon color as |related_text_color|.
Use a slightly different function that takes the icon color itself.

Bug: 999761
Test: Button color appears as expected.
Change-Id: Iff87e0f3950131695cbcfe179b4ef33732b55b3e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1861034
Commit-Queue: Michael Wasserman <msw@chromium.org>
Commit-Queue: Marijn Kruisselbrink <mek@chromium.org>
Auto-Submit: Michael Wasserman <msw@chromium.org>
Reviewed-by: default avatarMarijn Kruisselbrink <mek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705750}
parent d680737d
...@@ -138,12 +138,12 @@ class CollapsibleListView : public views::View, public views::ButtonListener { ...@@ -138,12 +138,12 @@ class CollapsibleListView : public views::View, public views::ButtonListener {
label->SetHorizontalAlignment(gfx::ALIGN_LEFT); label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
label_layout->SetFlexForView(label, 1); label_layout->SetFlexForView(label, 1);
auto button = views::CreateVectorToggleImageButton(this); auto button = views::CreateVectorToggleImageButton(this);
views::SetImageFromVectorIcon(button.get(), kCaretDownIcon, views::SetImageFromVectorIconWithColor(
ui::TableModel::kIconSize, icon_color); button.get(), kCaretDownIcon, ui::TableModel::kIconSize, icon_color);
button->SetTooltipText( button->SetTooltipText(
l10n_util::GetStringUTF16(IDS_NATIVE_FILE_SYSTEM_USAGE_EXPAND)); l10n_util::GetStringUTF16(IDS_NATIVE_FILE_SYSTEM_USAGE_EXPAND));
views::SetToggledImageFromVectorIcon(button.get(), kCaretUpIcon, views::SetToggledImageFromVectorIconWithColor(
ui::TableModel::kIconSize, icon_color); button.get(), kCaretUpIcon, ui::TableModel::kIconSize, icon_color);
button->SetToggledTooltipText( button->SetToggledTooltipText(
l10n_util::GetStringUTF16(IDS_NATIVE_FILE_SYSTEM_USAGE_COLLAPSE)); l10n_util::GetStringUTF16(IDS_NATIVE_FILE_SYSTEM_USAGE_COLLAPSE));
expand_collapse_button_ = label_container->AddChildView(std::move(button)); expand_collapse_button_ = label_container->AddChildView(std::move(button));
......
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