Commit f7195a6f authored by David Black's avatar David Black Committed by Commit Bot

Don't override unified theme in holding space drag images.

Holding space drag images currently have a light background until full
theming support is implemented. In the short term, use scoped light
mode as default.

Bug: 1131543
Change-Id: Ifcabe502bd600896201f86c4662e3b446dced17b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2510737
Auto-Submit: David Black <dmblack@google.com>
Reviewed-by: default avatarMin Chen <minch@chromium.org>
Commit-Queue: David Black <dmblack@google.com>
Cr-Commit-Position: refs/heads/master@{#822827}
parent 03bcbd73
......@@ -10,6 +10,8 @@
#include "ash/public/cpp/holding_space/holding_space_image.h"
#include "ash/public/cpp/holding_space/holding_space_item.h"
#include "ash/public/cpp/rounded_image_view.h"
#include "ash/style/ash_color_provider.h"
#include "ash/style/scoped_light_mode_as_default.h"
#include "ash/system/holding_space/holding_space_item_view.h"
#include "ash/system/tray/tray_popup_item_style.h"
#include "base/containers/adapters.h"
......@@ -210,9 +212,12 @@ class DragImageItemChipView : public DragImageItemView {
label->SetHorizontalAlignment(gfx::HorizontalAlignment::ALIGN_LEFT);
layout->SetFlexForView(label, 1);
TrayPopupItemStyle(TrayPopupItemStyle::FontStyle::DETAILED_VIEW_LABEL,
/*use_unified_theme=*/false)
TrayPopupItemStyle(TrayPopupItemStyle::FontStyle::DETAILED_VIEW_LABEL)
.SetupLabel(label);
ScopedLightModeAsDefault scoped_light_mode;
label->SetEnabledColor(AshColorProvider::Get()->GetContentLayerColor(
AshColorProvider::ContentLayerType::kTextColorPrimary));
}
};
......
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