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

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

Issue 273223002: views: Make view::Views::GetPreferredSize() const. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More compile fix for ToT Created 6 years, 7 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/tray_item_view.h ('k') | ash/system/tray/tray_popup_header_button.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/tray_item_view.cc
diff --git a/ash/system/tray/tray_item_view.cc b/ash/system/tray/tray_item_view.cc
index b2177f9e233ba3a70ebf06339e46e995813c33e1..ea2262dd829042e85ea9b8e4fa4e2403b2cb35a1 100644
--- a/ash/system/tray/tray_item_view.cc
+++ b/ash/system/tray/tray_item_view.cc
@@ -75,7 +75,7 @@ void TrayItemView::SetVisible(bool set_visible) {
}
}
-gfx::Size TrayItemView::DesiredSize() {
+gfx::Size TrayItemView::DesiredSize() const {
return views::View::GetPreferredSize();
}
@@ -83,7 +83,7 @@ int TrayItemView::GetAnimationDurationMS() {
return kTrayItemAnimationDurationMS;
}
-gfx::Size TrayItemView::GetPreferredSize() {
+gfx::Size TrayItemView::GetPreferredSize() const {
gfx::Size size = DesiredSize();
if (owner()->system_tray()->shelf_alignment() == SHELF_ALIGNMENT_BOTTOM ||
owner()->system_tray()->shelf_alignment() == SHELF_ALIGNMENT_TOP)
@@ -103,7 +103,7 @@ gfx::Size TrayItemView::GetPreferredSize() {
return size;
}
-int TrayItemView::GetHeightForWidth(int width) {
+int TrayItemView::GetHeightForWidth(int width) const {
return GetPreferredSize().height();
}
« no previous file with comments | « ash/system/tray/tray_item_view.h ('k') | ash/system/tray/tray_popup_header_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698