| Index: views/controls/textfield/textfield.cc
|
| diff --git a/views/controls/textfield/textfield.cc b/views/controls/textfield/textfield.cc
|
| index c2bc1288fedce19c2eb80cf796579fbb8bef72fb..6f2edd5ebd6fd90cd77365a59b0d0d7dcc26954a 100644
|
| --- a/views/controls/textfield/textfield.cc
|
| +++ b/views/controls/textfield/textfield.cc
|
| @@ -51,7 +51,6 @@ Textfield::Textfield()
|
| use_default_text_color_(true),
|
| background_color_(SK_ColorWHITE),
|
| use_default_background_color_(true),
|
| - num_lines_(1),
|
| initialized_(false),
|
| horizontal_margins_were_set_(false),
|
| vertical_margins_were_set_(false) {
|
| @@ -69,7 +68,6 @@ Textfield::Textfield(StyleFlags style)
|
| use_default_text_color_(true),
|
| background_color_(SK_ColorWHITE),
|
| use_default_background_color_(true),
|
| - num_lines_(1),
|
| initialized_(false),
|
| horizontal_margins_were_set_(false),
|
| vertical_margins_were_set_(false) {
|
| @@ -109,10 +107,6 @@ void Textfield::SetPassword(bool password) {
|
| native_wrapper_->UpdateIsPassword();
|
| }
|
|
|
| -bool Textfield::IsMultiLine() const {
|
| - return !!(style_ & STYLE_MULTILINE);
|
| -}
|
| -
|
| void Textfield::SetText(const string16& text) {
|
| text_ = text;
|
| if (native_wrapper_)
|
| @@ -197,12 +191,6 @@ void Textfield::SetVerticalMargins(int top, int bottom) {
|
| PreferredSizeChanged();
|
| }
|
|
|
| -void Textfield::SetHeightInLines(int num_lines) {
|
| - DCHECK(IsMultiLine());
|
| - num_lines_ = num_lines;
|
| - PreferredSizeChanged();
|
| -}
|
| -
|
| void Textfield::RemoveBorder() {
|
| if (!draw_border_)
|
| return;
|
| @@ -313,8 +301,7 @@ gfx::Size Textfield::GetPreferredSize() {
|
| if (draw_border_ && native_wrapper_)
|
| insets = native_wrapper_->CalculateInsets();
|
| return gfx::Size(font_.GetExpectedTextWidth(default_width_in_chars_) +
|
| - insets.width(),
|
| - num_lines_ * font_.GetHeight() + insets.height());
|
| + insets.width(), font_.GetHeight() + insets.height());
|
| }
|
|
|
| bool Textfield::IsFocusable() const {
|
|
|