OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "chrome/browser/browser_accessibility.h" | 5 #include "chrome/browser/browser_accessibility.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "chrome/browser/browser_accessibility_manager.h" | 8 #include "chrome/browser/browser_accessibility_manager.h" |
9 | 9 |
10 using webkit_glue::WebAccessibility; | 10 using webkit_glue::WebAccessibility; |
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
552 return BrowserAccessibilityManager::GetInstance()-> | 552 return BrowserAccessibilityManager::GetInstance()-> |
553 RequestAccessibilityInfo(&in_params, routing_id_, process_id_); | 553 RequestAccessibilityInfo(&in_params, routing_id_, process_id_); |
554 } | 554 } |
555 | 555 |
556 const WebAccessibility::OutParams& BrowserAccessibility::response() { | 556 const WebAccessibility::OutParams& BrowserAccessibility::response() { |
557 return BrowserAccessibilityManager::GetInstance()->response(); | 557 return BrowserAccessibilityManager::GetInstance()->response(); |
558 } | 558 } |
559 | 559 |
560 long BrowserAccessibility::MSAARole(long browser_accessibility_role) { | 560 long BrowserAccessibility::MSAARole(long browser_accessibility_role) { |
561 switch (browser_accessibility_role) { | 561 switch (browser_accessibility_role) { |
| 562 case WebAccessibility::ROLE_APPLICATION: |
| 563 return ROLE_SYSTEM_APPLICATION; |
562 case WebAccessibility::ROLE_CELL: | 564 case WebAccessibility::ROLE_CELL: |
563 return ROLE_SYSTEM_CELL; | 565 return ROLE_SYSTEM_CELL; |
564 case WebAccessibility::ROLE_CHECKBUTTON: | 566 case WebAccessibility::ROLE_CHECKBUTTON: |
565 return ROLE_SYSTEM_CHECKBUTTON; | 567 return ROLE_SYSTEM_CHECKBUTTON; |
566 case WebAccessibility::ROLE_COLUMN: | 568 case WebAccessibility::ROLE_COLUMN: |
567 return ROLE_SYSTEM_COLUMN; | 569 return ROLE_SYSTEM_COLUMN; |
568 case WebAccessibility::ROLE_COLUMNHEADER: | 570 case WebAccessibility::ROLE_COLUMNHEADER: |
569 return ROLE_SYSTEM_COLUMNHEADER; | 571 return ROLE_SYSTEM_COLUMNHEADER; |
570 case WebAccessibility::ROLE_DOCUMENT: | 572 case WebAccessibility::ROLE_DOCUMENT: |
571 return ROLE_SYSTEM_DOCUMENT; | 573 return ROLE_SYSTEM_DOCUMENT; |
(...skipping 19 matching lines...) Expand all Loading... |
591 case WebAccessibility::ROLE_PROGRESSBAR: | 593 case WebAccessibility::ROLE_PROGRESSBAR: |
592 return ROLE_SYSTEM_PROGRESSBAR; | 594 return ROLE_SYSTEM_PROGRESSBAR; |
593 case WebAccessibility::ROLE_PUSHBUTTON: | 595 case WebAccessibility::ROLE_PUSHBUTTON: |
594 return ROLE_SYSTEM_PUSHBUTTON; | 596 return ROLE_SYSTEM_PUSHBUTTON; |
595 case WebAccessibility::ROLE_RADIOBUTTON: | 597 case WebAccessibility::ROLE_RADIOBUTTON: |
596 return ROLE_SYSTEM_RADIOBUTTON; | 598 return ROLE_SYSTEM_RADIOBUTTON; |
597 case WebAccessibility::ROLE_ROW: | 599 case WebAccessibility::ROLE_ROW: |
598 return ROLE_SYSTEM_ROW; | 600 return ROLE_SYSTEM_ROW; |
599 case WebAccessibility::ROLE_ROWHEADER: | 601 case WebAccessibility::ROLE_ROWHEADER: |
600 return ROLE_SYSTEM_ROWHEADER; | 602 return ROLE_SYSTEM_ROWHEADER; |
| 603 case WebAccessibility::ROLE_SEPARATOR: |
| 604 return ROLE_SYSTEM_SEPARATOR; |
601 case WebAccessibility::ROLE_SLIDER: | 605 case WebAccessibility::ROLE_SLIDER: |
602 return ROLE_SYSTEM_SLIDER; | 606 return ROLE_SYSTEM_SLIDER; |
603 case WebAccessibility::ROLE_STATICTEXT: | 607 case WebAccessibility::ROLE_STATICTEXT: |
604 return ROLE_SYSTEM_STATICTEXT; | 608 return ROLE_SYSTEM_STATICTEXT; |
| 609 case WebAccessibility::ROLE_STATUSBAR: |
| 610 return ROLE_SYSTEM_STATUSBAR; |
605 case WebAccessibility::ROLE_TABLE: | 611 case WebAccessibility::ROLE_TABLE: |
606 return ROLE_SYSTEM_TABLE; | 612 return ROLE_SYSTEM_TABLE; |
607 case WebAccessibility::ROLE_TEXT: | 613 case WebAccessibility::ROLE_TEXT: |
608 return ROLE_SYSTEM_TEXT; | 614 return ROLE_SYSTEM_TEXT; |
609 case WebAccessibility::ROLE_TOOLBAR: | 615 case WebAccessibility::ROLE_TOOLBAR: |
610 return ROLE_SYSTEM_TOOLBAR; | 616 return ROLE_SYSTEM_TOOLBAR; |
| 617 case WebAccessibility::ROLE_TOOLTIP: |
| 618 return ROLE_SYSTEM_TOOLTIP; |
611 case WebAccessibility::ROLE_CLIENT: | 619 case WebAccessibility::ROLE_CLIENT: |
612 default: | 620 default: |
613 // This is the default role for MSAA. | 621 // This is the default role for MSAA. |
614 return ROLE_SYSTEM_CLIENT; | 622 return ROLE_SYSTEM_CLIENT; |
615 } | 623 } |
616 } | 624 } |
617 | 625 |
618 long BrowserAccessibility::MSAAState(long browser_accessibility_state) { | 626 long BrowserAccessibility::MSAAState(long browser_accessibility_state) { |
619 long state = 0; | 627 long state = 0; |
620 | 628 |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
656 state |= STATE_SYSTEM_READONLY; | 664 state |= STATE_SYSTEM_READONLY; |
657 | 665 |
658 if ((browser_accessibility_state >> WebAccessibility::STATE_TRAVERSED) & 1) | 666 if ((browser_accessibility_state >> WebAccessibility::STATE_TRAVERSED) & 1) |
659 state |= STATE_SYSTEM_TRAVERSED; | 667 state |= STATE_SYSTEM_TRAVERSED; |
660 | 668 |
661 if ((browser_accessibility_state >> WebAccessibility::STATE_UNAVAILABLE) & 1) | 669 if ((browser_accessibility_state >> WebAccessibility::STATE_UNAVAILABLE) & 1) |
662 state |= STATE_SYSTEM_UNAVAILABLE; | 670 state |= STATE_SYSTEM_UNAVAILABLE; |
663 | 671 |
664 return state; | 672 return state; |
665 } | 673 } |
OLD | NEW |