OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ui/views/accessibility/native_view_accessibility_win.h" | 5 #include "ui/views/accessibility/native_view_accessibility_win.h" |
6 | 6 |
7 #include <oleacc.h> | 7 #include <oleacc.h> |
8 #include <UIAutomationClient.h> | 8 #include <UIAutomationClient.h> |
9 | 9 |
10 #include <set> | 10 #include <set> |
(...skipping 1148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1159 << __FUNCTION__ | 1159 << __FUNCTION__ |
1160 << " for pattern id: " | 1160 << " for pattern id: " |
1161 << id; | 1161 << id; |
1162 if (id == UIA_ValuePatternId || id == UIA_TextPatternId) { | 1162 if (id == UIA_ValuePatternId || id == UIA_TextPatternId) { |
1163 ui::AXViewState state; | 1163 ui::AXViewState state; |
1164 view_->GetAccessibleState(&state); | 1164 view_->GetAccessibleState(&state); |
1165 long role = MSAARole(state.role); | 1165 long role = MSAARole(state.role); |
1166 | 1166 |
1167 if (role == ROLE_SYSTEM_TEXT) { | 1167 if (role == ROLE_SYSTEM_TEXT) { |
1168 DVLOG(1) << "Returning UIA text provider"; | 1168 DVLOG(1) << "Returning UIA text provider"; |
1169 base::win::UIATextProvider::CreateTextProvider(true, provider); | 1169 base::win::UIATextProvider::CreateTextProvider( |
| 1170 state.value, true, provider); |
1170 return S_OK; | 1171 return S_OK; |
1171 } | 1172 } |
1172 } | 1173 } |
1173 return E_NOTIMPL; | 1174 return E_NOTIMPL; |
1174 } | 1175 } |
1175 | 1176 |
1176 STDMETHODIMP NativeViewAccessibilityWin::GetPropertyValue(PROPERTYID id, | 1177 STDMETHODIMP NativeViewAccessibilityWin::GetPropertyValue(PROPERTYID id, |
1177 VARIANT* ret) { | 1178 VARIANT* ret) { |
1178 DVLOG(1) << "In Function: " | 1179 DVLOG(1) << "In Function: " |
1179 << __FUNCTION__ | 1180 << __FUNCTION__ |
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1494 if (view == NULL || view == view_) { | 1495 if (view == NULL || view == view_) { |
1495 alert_target_view_storage_ids_.erase( | 1496 alert_target_view_storage_ids_.erase( |
1496 alert_target_view_storage_ids_.begin() + i); | 1497 alert_target_view_storage_ids_.begin() + i); |
1497 } else { | 1498 } else { |
1498 ++i; | 1499 ++i; |
1499 } | 1500 } |
1500 } | 1501 } |
1501 } | 1502 } |
1502 | 1503 |
1503 } // namespace views | 1504 } // namespace views |
OLD | NEW |