summaryrefslogtreecommitdiffstats
path: root/views/controls/textfield/native_textfield_win.cc
diff options
context:
space:
mode:
Diffstat (limited to 'views/controls/textfield/native_textfield_win.cc')
-rw-r--r--views/controls/textfield/native_textfield_win.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/views/controls/textfield/native_textfield_win.cc b/views/controls/textfield/native_textfield_win.cc
index 2047d40..8a735d0 100644
--- a/views/controls/textfield/native_textfield_win.cc
+++ b/views/controls/textfield/native_textfield_win.cc
@@ -12,6 +12,7 @@
#include "base/win/windows_version.h"
#include "grit/app_strings.h"
#include "skia/ext/skia_utils_win.h"
+#include "ui/base/accessibility/accessible_view_state.h"
#include "ui/base/clipboard/clipboard.h"
#include "ui/base/clipboard/scoped_clipboard_writer.h"
#include "ui/base/keycodes/keyboard_codes.h"
@@ -441,10 +442,11 @@ void NativeTextfieldWin::InitializeAccessibilityInfo() {
// We expect it to be a Label preceeding this view (if it exists).
string16 name;
View* label_view = parent->GetChildViewAt(label_index);
- if (label_view->GetClassName() == Label::kViewClassName &&
- label_view->GetAccessibleName(&name)) {
+ if (label_view->GetClassName() == Label::kViewClassName) {
+ ui::AccessibleViewState state;
+ label_view->GetAccessibleState(&state);
hr = pAccPropServices->SetHwndPropStr(m_hWnd, OBJID_CLIENT,
- CHILDID_SELF, PROPID_ACC_NAME, name.c_str());
+ CHILDID_SELF, PROPID_ACC_NAME, state.name.c_str());
}
}
}