ash/system/tray/fixed_sized_image_view.cc - Issue 273223002: views: Make view::Views::GetPreferredSize() const.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/system/tray/fixed_sized_image_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:

Index: ash/system/tray/fixed_sized_image_view.cc

diff --git a/ash/system/tray/fixed_sized_image_view.cc b/ash/system/tray/fixed_sized_image_view.cc

index 9eb949723f35b4fcec0c4cff560deda09d4db30b..841165ea6c389d729727b0d6f2a334e237de15e4 100644

--- a/ash/system/tray/fixed_sized_image_view.cc

+++ b/ash/system/tray/fixed_sized_image_view.cc

@@ -16,7 +16,7 @@ FixedSizedImageView::FixedSizedImageView(int width, int height)

FixedSizedImageView::~FixedSizedImageView() {

}

-gfx::Size FixedSizedImageView::GetPreferredSize() {

+gfx::Size FixedSizedImageView::GetPreferredSize() const {

gfx::Size size = views::ImageView::GetPreferredSize();

return gfx::Size(width_ ? width_ : size.width(),

height_ ? height_ : size.height());

« no previous file with comments | « ash/system/tray/fixed_sized_image_view.h ('k') | ash/system/tray/fixed_sized_scroll_view.h » ('j') | no next file with comments »