| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 <atlbase.h> | 5 #include <atlbase.h> |
| 6 #include <atlcom.h> | 6 #include <atlcom.h> |
| 7 #include <limits.h> | 7 #include <limits.h> |
| 8 #include <oleacc.h> | 8 #include <oleacc.h> |
| 9 #include <stdint.h> | 9 #include <stdint.h> |
| 10 | 10 |
| (...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 454 } | 454 } |
| 455 | 455 |
| 456 return S_OK; | 456 return S_OK; |
| 457 } | 457 } |
| 458 | 458 |
| 459 STDMETHODIMP AXPlatformNodeWin::get_accKeyboardShortcut( | 459 STDMETHODIMP AXPlatformNodeWin::get_accKeyboardShortcut( |
| 460 VARIANT var_id, BSTR* acc_key) { | 460 VARIANT var_id, BSTR* acc_key) { |
| 461 AXPlatformNodeWin* target; | 461 AXPlatformNodeWin* target; |
| 462 COM_OBJECT_VALIDATE_VAR_ID_1_ARG_AND_GET_TARGET(var_id, acc_key, target); | 462 COM_OBJECT_VALIDATE_VAR_ID_1_ARG_AND_GET_TARGET(var_id, acc_key, target); |
| 463 | 463 |
| 464 return target->GetStringAttributeAsBstr(ui::AX_ATTR_SHORTCUT, acc_key); | 464 return target->GetStringAttributeAsBstr(ui::AX_ATTR_KEY_SHORTCUTS, acc_key); |
| 465 } | 465 } |
| 466 | 466 |
| 467 STDMETHODIMP AXPlatformNodeWin::get_accName( | 467 STDMETHODIMP AXPlatformNodeWin::get_accName( |
| 468 VARIANT var_id, BSTR* name) { | 468 VARIANT var_id, BSTR* name) { |
| 469 AXPlatformNodeWin* target; | 469 AXPlatformNodeWin* target; |
| 470 COM_OBJECT_VALIDATE_VAR_ID_1_ARG_AND_GET_TARGET(var_id, name, target); | 470 COM_OBJECT_VALIDATE_VAR_ID_1_ARG_AND_GET_TARGET(var_id, name, target); |
| 471 | 471 |
| 472 HRESULT result = target->GetStringAttributeAsBstr(ui::AX_ATTR_NAME, name); | 472 HRESULT result = target->GetStringAttributeAsBstr(ui::AX_ATTR_NAME, name); |
| 473 if (FAILED(result) && MSAARole() == ROLE_SYSTEM_DOCUMENT && GetParent()) { | 473 if (FAILED(result) && MSAARole() == ROLE_SYSTEM_DOCUMENT && GetParent()) { |
| 474 // Hack: Some versions of JAWS crash if they get an empty name on | 474 // Hack: Some versions of JAWS crash if they get an empty name on |
| (...skipping 818 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1293 | 1293 |
| 1294 AXPlatformNodeBase* base = | 1294 AXPlatformNodeBase* base = |
| 1295 FromNativeViewAccessible(node->GetNativeViewAccessible()); | 1295 FromNativeViewAccessible(node->GetNativeViewAccessible()); |
| 1296 if (base && !IsDescendant(base)) | 1296 if (base && !IsDescendant(base)) |
| 1297 base = nullptr; | 1297 base = nullptr; |
| 1298 | 1298 |
| 1299 return static_cast<AXPlatformNodeWin*>(base); | 1299 return static_cast<AXPlatformNodeWin*>(base); |
| 1300 } | 1300 } |
| 1301 | 1301 |
| 1302 } // namespace ui | 1302 } // namespace ui |
| OLD | NEW |