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

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

Issue 2709903004: Consolidate some more ash tray constants. (Closed)
Patch Set: rebase/review Created 3 years, 10 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/common/system/status_area_widget_delegate.cc ('k') | ash/common/system/tray/system_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/hover_highlight_view.cc
diff --git a/ash/common/system/tray/hover_highlight_view.cc b/ash/common/system/tray/hover_highlight_view.cc
index 739810c9076559400fdefd1f6149f22c1f317918..bce79a46e2fdbd8ba3f39f8a83269d2e05ca5c47 100644
--- a/ash/common/system/tray/hover_highlight_view.cc
+++ b/ash/common/system/tray/hover_highlight_view.cc
@@ -373,12 +373,11 @@ void HoverHighlightView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
gfx::Size HoverHighlightView::GetPreferredSize() const {
gfx::Size size = ActionableView::GetPreferredSize();
- const int default_height = GetTrayConstant(TRAY_POPUP_ITEM_MIN_HEIGHT);
if (custom_height_)
size.set_height(custom_height_);
- else if (!expandable_ || size.height() < default_height)
- size.set_height(default_height);
+ else if (!expandable_ || size.height() < kTrayPopupItemMinHeight)
+ size.set_height(kTrayPopupItemMinHeight);
return size;
}
« no previous file with comments | « ash/common/system/status_area_widget_delegate.cc ('k') | ash/common/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698