Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2267)

Unified Diff: ash/system/tray/hover_highlight_view.cc

Issue 2844933003: [Ash] Disallow calling HoverHighlightView::SetSubText() with an empty string (Closed)
Patch Set: comments addressed Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/tray/hover_highlight_view.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/hover_highlight_view.cc
diff --git a/ash/system/tray/hover_highlight_view.cc b/ash/system/tray/hover_highlight_view.cc
index e96272b6761e84dc7390fca4249f3bf68588ab77..9df8b65220fa81c92ba89ccc264a8bcfec8ff6d5 100644
--- a/ash/system/tray/hover_highlight_view.cc
+++ b/ash/system/tray/hover_highlight_view.cc
@@ -57,11 +57,13 @@ void HoverHighlightView::SetRightViewVisible(bool visible) {
void HoverHighlightView::SetSubText(const base::string16& sub_text) {
DCHECK(text_label_);
+ DCHECK(!sub_text.empty());
if (!sub_text_label_) {
sub_text_label_ = TrayPopupUtils::CreateDefaultLabel();
tri_view_->AddView(TriView::Container::CENTER, sub_text_label_);
}
+
TrayPopupItemStyle sub_style(TrayPopupItemStyle::FontStyle::CAPTION);
sub_style.set_color_style(TrayPopupItemStyle::ColorStyle::INACTIVE);
sub_style.SetupLabel(sub_text_label_);
@@ -117,7 +119,8 @@ void HoverHighlightView::DoAddIconAndLabels(
style.SetupLabel(text_label_);
tri_view_->AddView(TriView::Container::CENTER, text_label_);
- SetSubText(sub_text);
+ if (!sub_text.empty())
+ SetSubText(sub_text);
tri_view_->SetContainerVisible(TriView::Container::END, false);
« no previous file with comments | « ash/system/tray/hover_highlight_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698