| 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 1313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1324 case ui::AX_ROLE_SLIDER: | 1324 case ui::AX_ROLE_SLIDER: |
| 1325 return ROLE_SYSTEM_SLIDER; | 1325 return ROLE_SYSTEM_SLIDER; |
| 1326 case ui::AX_ROLE_STATIC_TEXT: | 1326 case ui::AX_ROLE_STATIC_TEXT: |
| 1327 return ROLE_SYSTEM_STATICTEXT; | 1327 return ROLE_SYSTEM_STATICTEXT; |
| 1328 case ui::AX_ROLE_TEXT_FIELD: | 1328 case ui::AX_ROLE_TEXT_FIELD: |
| 1329 return ROLE_SYSTEM_TEXT; | 1329 return ROLE_SYSTEM_TEXT; |
| 1330 case ui::AX_ROLE_TITLE_BAR: | 1330 case ui::AX_ROLE_TITLE_BAR: |
| 1331 return ROLE_SYSTEM_TITLEBAR; | 1331 return ROLE_SYSTEM_TITLEBAR; |
| 1332 case ui::AX_ROLE_TOOLBAR: | 1332 case ui::AX_ROLE_TOOLBAR: |
| 1333 return ROLE_SYSTEM_TOOLBAR; | 1333 return ROLE_SYSTEM_TOOLBAR; |
| 1334 case ui::AX_ROLE_WEB_VIEW: |
| 1335 return ROLE_SYSTEM_GROUPING; |
| 1334 case ui::AX_ROLE_WINDOW: | 1336 case ui::AX_ROLE_WINDOW: |
| 1335 return ROLE_SYSTEM_WINDOW; | 1337 return ROLE_SYSTEM_WINDOW; |
| 1336 case ui::AX_ROLE_CLIENT: | 1338 case ui::AX_ROLE_CLIENT: |
| 1337 default: | 1339 default: |
| 1338 // This is the default role for MSAA. | 1340 // This is the default role for MSAA. |
| 1339 return ROLE_SYSTEM_CLIENT; | 1341 return ROLE_SYSTEM_CLIENT; |
| 1340 } | 1342 } |
| 1341 } | 1343 } |
| 1342 | 1344 |
| 1343 int32 NativeViewAccessibilityWin::MSAAState(const ui::AXViewState& state) { | 1345 int32 NativeViewAccessibilityWin::MSAAState(const ui::AXViewState& state) { |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1529 if (view == NULL || view == view_) { | 1531 if (view == NULL || view == view_) { |
| 1530 alert_target_view_storage_ids_.erase( | 1532 alert_target_view_storage_ids_.erase( |
| 1531 alert_target_view_storage_ids_.begin() + i); | 1533 alert_target_view_storage_ids_.begin() + i); |
| 1532 } else { | 1534 } else { |
| 1533 ++i; | 1535 ++i; |
| 1534 } | 1536 } |
| 1535 } | 1537 } |
| 1536 } | 1538 } |
| 1537 | 1539 |
| 1538 } // namespace views | 1540 } // namespace views |
| OLD | NEW |