ui/views/controls/textfield/textfield.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/textfield/textfield.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/textfield/textfield.cc

diff --git a/ui/views/controls/textfield/textfield.cc b/ui/views/controls/textfield/textfield.cc

index 78d5ae5b8a3b078bd2466e3dac247337835d6220..585068751e28f78e2b65fa41aa3f0d7136c301f6 100644

--- a/ui/views/controls/textfield/textfield.cc

+++ b/ui/views/controls/textfield/textfield.cc

@@ -481,7 +481,7 @@ int Textfield::GetBaseline() const {

return GetInsets().top() + GetRenderText()->GetBaseline();

}

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

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

const gfx::Insets& insets = GetInsets();

return gfx::Size(GetFontList().GetExpectedTextWidth(default_width_in_chars_) +

insets.width(), GetFontList().GetHeight() + insets.height());