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

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

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_details_view.cc ('k') | ash/system/tray/tray_item_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/tray_item_view.h
diff --git a/ash/system/tray/tray_item_view.h b/ash/system/tray/tray_item_view.h
index 854af3c13e7a055510f6d87b0bdcdc0904136b84..37e239f0aa740f6adc31dadc8e662e2ea8285daf 100644
--- a/ash/system/tray/tray_item_view.h
+++ b/ash/system/tray/tray_item_view.h
@@ -42,8 +42,8 @@ class ASH_EXPORT TrayItemView : public views::View,
// Overridden from views::View.
virtual void SetVisible(bool visible) OVERRIDE;
- virtual gfx::Size GetPreferredSize() OVERRIDE;
- virtual int GetHeightForWidth(int width) OVERRIDE;
+ virtual gfx::Size GetPreferredSize() const OVERRIDE;
+ virtual int GetHeightForWidth(int width) const OVERRIDE;
protected:
// Makes sure the widget relayouts after the size/visibility of the view
@@ -54,7 +54,7 @@ class ASH_EXPORT TrayItemView : public views::View,
// returns GetPreferredSize. But since this class overrides GetPreferredSize
// for animation purposes, we allow a different way to get this size, and do
// not allow GetPreferredSize to be overridden.
- virtual gfx::Size DesiredSize();
+ virtual gfx::Size DesiredSize() const;
// The default animation duration is 200ms. But each view can customize this.
virtual int GetAnimationDurationMS();
« no previous file with comments | « ash/system/tray/tray_details_view.cc ('k') | ash/system/tray/tray_item_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698