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

Unified Diff: ash/system/user/user_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/user/user_view.h ('k') | ash/system/web_notification/web_notification_tray.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/user/user_view.cc
diff --git a/ash/system/user/user_view.cc b/ash/system/user/user_view.cc
index 289da2837ef76e32112f873d766a19c973713c57..ddfae3864a24bbdbad6b05a81466c43f6ac569a9 100644
--- a/ash/system/user/user_view.cc
+++ b/ash/system/user/user_view.cc
@@ -137,7 +137,7 @@ class AddUserView : public views::View {
private:
// Overridden from views::View.
- virtual gfx::Size GetPreferredSize() OVERRIDE;
+ virtual gfx::Size GetPreferredSize() const OVERRIDE;
// Create the additional client content for this item.
void AddContent();
@@ -164,7 +164,7 @@ AddUserView::~AddUserView() {
owner_->ForceBorderVisible(false);
}
-gfx::Size AddUserView::GetPreferredSize() {
+gfx::Size AddUserView::GetPreferredSize() const {
return owner_->bounds().size();
}
@@ -257,7 +257,7 @@ gfx::Rect UserView::GetBoundsInScreenOfUserButtonForTest() {
return user_card_view_->GetBoundsInScreen();
}
-gfx::Size UserView::GetPreferredSize() {
+gfx::Size UserView::GetPreferredSize() const {
gfx::Size size = views::View::GetPreferredSize();
// Only the active user panel will be forced to a certain height.
if (!multiprofile_index_) {
@@ -267,7 +267,7 @@ gfx::Size UserView::GetPreferredSize() {
return size;
}
-int UserView::GetHeightForWidth(int width) {
+int UserView::GetHeightForWidth(int width) const {
return GetPreferredSize().height();
}
« no previous file with comments | « ash/system/user/user_view.h ('k') | ash/system/web_notification/web_notification_tray.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698