| Index: ui/views/controls/textfield/native_textfield_win.cc
|
| diff --git a/ui/views/controls/textfield/native_textfield_win.cc b/ui/views/controls/textfield/native_textfield_win.cc
|
| index 37c7fc790b1bcd90ca1e6dd3361fe3888b7599f2..defe632cf8049015a55af637a4a78cfec231facb 100644
|
| --- a/ui/views/controls/textfield/native_textfield_win.cc
|
| +++ b/ui/views/controls/textfield/native_textfield_win.cc
|
| @@ -251,7 +251,8 @@ void NativeTextfieldWin::UpdateReadOnly() {
|
|
|
| void NativeTextfieldWin::UpdateFont() {
|
| SendMessage(m_hWnd, WM_SETFONT,
|
| - reinterpret_cast<WPARAM>(textfield_->font().GetNativeFont()),
|
| + reinterpret_cast<WPARAM>(
|
| + textfield_->GetPrimaryFont().GetNativeFont()),
|
| TRUE);
|
| // Setting the font blows away any text color we've set, so reset it.
|
| UpdateTextColor();
|
| @@ -419,11 +420,11 @@ void NativeTextfieldWin::ClearEditHistory() {
|
| }
|
|
|
| int NativeTextfieldWin::GetFontHeight() {
|
| - return textfield_->font().GetHeight();
|
| + return textfield_->font_list().GetHeight();
|
| }
|
|
|
| int NativeTextfieldWin::GetTextfieldBaseline() const {
|
| - return textfield_->font().GetBaseline();
|
| + return textfield_->font_list().GetBaseline();
|
| }
|
|
|
| int NativeTextfieldWin::GetWidthNeededForText() const {
|
|
|