ui/views/controls/button/label_button.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: ui/views/controls/button/label_button.cc

Issue 273223002: views: Make view::Views::GetPreferredSize() const. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase to 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: ui/views/controls/button/label_button.cc

diff --git a/ui/views/controls/button/label_button.cc b/ui/views/controls/button/label_button.cc

index 691f815cc817c9a3e1103c5a7a5cdc7f74c7df51..f274ac787596b89dca7f42883f93da37724e0c4b 100644

--- a/ui/views/controls/button/label_button.cc

+++ b/ui/views/controls/button/label_button.cc

@@ -173,7 +173,7 @@ void LabelButton::SetFocusPainter(scoped_ptr<Painter> focus_painter) {

focus_painter_ = focus_painter.Pass();

}

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

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

// Use a temporary label copy for sizing to avoid calculation side-effects.

Label label(GetText(), cached_normal_font_list_);

label.SetMultiLine(GetTextMultiLine());