summaryrefslogtreecommitdiffstats
path: root/views/window/window_win.cc
diff options
context:
space:
mode:
Diffstat (limited to 'views/window/window_win.cc')
-rw-r--r--views/window/window_win.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/views/window/window_win.cc b/views/window/window_win.cc
index 7776bea..49c9b2a 100644
--- a/views/window/window_win.cc
+++ b/views/window/window_win.cc
@@ -11,6 +11,7 @@
#include "base/win/scoped_gdi_object.h"
#include "base/win/win_util.h"
#include "base/win/windows_version.h"
+#include "ui/base/accessibility/accessibility_types.h"
#include "ui/base/keycodes/keyboard_code_conversion_win.h"
#include "ui/base/l10n/l10n_util_win.h"
#include "ui/base/theme_provider.h"
@@ -19,7 +20,7 @@
#include "ui/gfx/font.h"
#include "ui/gfx/icon_util.h"
#include "ui/gfx/path.h"
-#include "views/accessibility/view_accessibility.h"
+#include "views/accessibility/native_view_accessibility_win.h"
#include "views/widget/root_view.h"
#include "views/window/client_view.h"
#include "views/window/custom_frame_view.h"
@@ -1448,10 +1449,10 @@ void WindowWin::UpdateAccessibleRole() {
IID_IAccPropServices, reinterpret_cast<void**>(&pAccPropServices));
if (SUCCEEDED(hr)) {
VARIANT var;
- AccessibilityTypes::Role role = window_delegate_->accessible_role();
+ ui::AccessibilityTypes::Role role = window_delegate_->GetAccessibleRole();
if (role) {
var.vt = VT_I4;
- var.lVal = ViewAccessibility::MSAARole(role);
+ var.lVal = NativeViewAccessibilityWin::MSAARole(role);
hr = pAccPropServices->SetHwndProp(GetNativeView(), OBJID_CLIENT,
CHILDID_SELF, PROPID_ACC_ROLE, var);
}
@@ -1464,9 +1465,10 @@ void WindowWin::UpdateAccessibleState() {
IID_IAccPropServices, reinterpret_cast<void**>(&pAccPropServices));
if (SUCCEEDED(hr)) {
VARIANT var;
- AccessibilityTypes::State state = window_delegate_->accessible_state();
+ ui::AccessibilityTypes::State state =
+ window_delegate_->GetAccessibleState();
if (state) {
- var.lVal = ViewAccessibility::MSAAState(state);
+ var.lVal = NativeViewAccessibilityWin::MSAAState(state);
hr = pAccPropServices->SetHwndProp(GetNativeView(), OBJID_CLIENT,
CHILDID_SELF, PROPID_ACC_STATE, var);
}