| Index: ash/common/system/tray_accessibility.cc
|
| diff --git a/ash/common/system/tray_accessibility.cc b/ash/common/system/tray_accessibility.cc
|
| index 47eb8fbf0cf4771ef45b380075233457e690d4b9..b4c6276400e2f6cd91fa5a74051c723982642cd7 100644
|
| --- a/ash/common/system/tray_accessibility.cc
|
| +++ b/ash/common/system/tray_accessibility.cc
|
| @@ -25,7 +25,6 @@
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| -#include "ui/gfx/color_palette.h"
|
| #include "ui/gfx/image/image.h"
|
| #include "ui/gfx/paint_vector_icon.h"
|
| #include "ui/resources/grit/ui_resources.h"
|
| @@ -89,20 +88,6 @@ LoginStatus GetCurrentLoginStatus() {
|
| return Shell::Get()->system_tray_delegate()->GetUserLoginStatus();
|
| }
|
|
|
| -void UpdateCheckMark(HoverHighlightView* container, bool checked) {
|
| - if (checked) {
|
| - gfx::ImageSkia check_mark =
|
| - CreateVectorIcon(kCheckCircleIcon, gfx::kGoogleGreen700);
|
| - container->AddRightIcon(check_mark, check_mark.width());
|
| - container->SetRightViewVisible(true);
|
| - container->SetAccessiblityState(
|
| - HoverHighlightView::AccessibilityState::CHECKED_CHECKBOX);
|
| - } else {
|
| - container->SetAccessiblityState(
|
| - HoverHighlightView::AccessibilityState::UNCHECKED_CHECKBOX);
|
| - }
|
| -}
|
| -
|
| } // namespace
|
|
|
| namespace tray {
|
| @@ -302,7 +287,7 @@ HoverHighlightView* AccessibilityDetailedView::AddScrollListItem(
|
| HoverHighlightView* container = new HoverHighlightView(this);
|
| gfx::ImageSkia image = CreateVectorIcon(icon, kMenuIconColor);
|
| container->AddIconAndLabel(image, text);
|
| - UpdateCheckMark(container, checked);
|
| + TrayPopupUtils::UpdateCheckMarkVisibility(container, checked);
|
| scroll_content()->AddChildView(container);
|
| return container;
|
| }
|
| @@ -312,9 +297,7 @@ HoverHighlightView* AccessibilityDetailedView::AddScrollListItemWithoutIcon(
|
| bool checked) {
|
| HoverHighlightView* container = new HoverHighlightView(this);
|
| container->AddLabelRow(text);
|
| -
|
| - UpdateCheckMark(container, checked);
|
| -
|
| + TrayPopupUtils::UpdateCheckMarkVisibility(container, checked);
|
| scroll_content()->AddChildView(container);
|
| return container;
|
| }
|
|
|