Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(326)

Side by Side Diff: ui/accessibility/platform/ax_platform_node_mac.mm

Issue 2948883003: Update AX role mapping for summary to AXButton on Mac (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #import "ui/accessibility/platform/ax_platform_node_mac.h" 5 #import "ui/accessibility/platform/ax_platform_node_mac.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 {ui::AX_ROLE_CONTENT_INFO, NSAccessibilityGroupRole}, 59 {ui::AX_ROLE_CONTENT_INFO, NSAccessibilityGroupRole},
60 {ui::AX_ROLE_DATE, @"AXDateField"}, 60 {ui::AX_ROLE_DATE, @"AXDateField"},
61 {ui::AX_ROLE_DATE_TIME, @"AXDateField"}, 61 {ui::AX_ROLE_DATE_TIME, @"AXDateField"},
62 {ui::AX_ROLE_DEFINITION, NSAccessibilityGroupRole}, 62 {ui::AX_ROLE_DEFINITION, NSAccessibilityGroupRole},
63 {ui::AX_ROLE_DESCRIPTION_LIST_DETAIL, NSAccessibilityGroupRole}, 63 {ui::AX_ROLE_DESCRIPTION_LIST_DETAIL, NSAccessibilityGroupRole},
64 {ui::AX_ROLE_DESCRIPTION_LIST, NSAccessibilityListRole}, 64 {ui::AX_ROLE_DESCRIPTION_LIST, NSAccessibilityListRole},
65 {ui::AX_ROLE_DESCRIPTION_LIST_TERM, NSAccessibilityGroupRole}, 65 {ui::AX_ROLE_DESCRIPTION_LIST_TERM, NSAccessibilityGroupRole},
66 {ui::AX_ROLE_DIALOG, NSAccessibilityGroupRole}, 66 {ui::AX_ROLE_DIALOG, NSAccessibilityGroupRole},
67 {ui::AX_ROLE_DETAILS, NSAccessibilityGroupRole}, 67 {ui::AX_ROLE_DETAILS, NSAccessibilityGroupRole},
68 {ui::AX_ROLE_DIRECTORY, NSAccessibilityListRole}, 68 {ui::AX_ROLE_DIRECTORY, NSAccessibilityListRole},
69 {ui::AX_ROLE_DISCLOSURE_TRIANGLE, NSAccessibilityDisclosureTriangleRole}, 69 // If Mac supports AXExpandedChanged event with
70 // NSAccessibilityDisclosureTriangleRole, We should update
71 // AX_ROLE_DISCLOSURE_TRIANGLE mapping to
72 // NSAccessibilityDisclosureTriangleRole. http://crbug.com/558324
73 {ui::AX_ROLE_DISCLOSURE_TRIANGLE, NSAccessibilityButtonRole},
70 {ui::AX_ROLE_DOCUMENT, NSAccessibilityGroupRole}, 74 {ui::AX_ROLE_DOCUMENT, NSAccessibilityGroupRole},
71 {ui::AX_ROLE_EMBEDDED_OBJECT, NSAccessibilityGroupRole}, 75 {ui::AX_ROLE_EMBEDDED_OBJECT, NSAccessibilityGroupRole},
72 {ui::AX_ROLE_FIGCAPTION, NSAccessibilityGroupRole}, 76 {ui::AX_ROLE_FIGCAPTION, NSAccessibilityGroupRole},
73 {ui::AX_ROLE_FIGURE, NSAccessibilityGroupRole}, 77 {ui::AX_ROLE_FIGURE, NSAccessibilityGroupRole},
74 {ui::AX_ROLE_FOOTER, NSAccessibilityGroupRole}, 78 {ui::AX_ROLE_FOOTER, NSAccessibilityGroupRole},
75 {ui::AX_ROLE_FORM, NSAccessibilityGroupRole}, 79 {ui::AX_ROLE_FORM, NSAccessibilityGroupRole},
76 {ui::AX_ROLE_GENERIC_CONTAINER, NSAccessibilityGroupRole}, 80 {ui::AX_ROLE_GENERIC_CONTAINER, NSAccessibilityGroupRole},
77 {ui::AX_ROLE_GRID, NSAccessibilityGridRole}, 81 {ui::AX_ROLE_GRID, NSAccessibilityGridRole},
78 {ui::AX_ROLE_GROUP, NSAccessibilityGroupRole}, 82 {ui::AX_ROLE_GROUP, NSAccessibilityGroupRole},
79 {ui::AX_ROLE_HEADING, @"AXHeading"}, 83 {ui::AX_ROLE_HEADING, @"AXHeading"},
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 // NSAccessibilityConstants.h, or see https://crbug.com/678898. 502 // NSAccessibilityConstants.h, or see https://crbug.com/678898.
499 503
500 - (NSString*)AXRole { 504 - (NSString*)AXRole {
501 if (!node_) 505 if (!node_)
502 return nil; 506 return nil;
503 return [[self class] nativeRoleFromAXRole:node_->GetData().role]; 507 return [[self class] nativeRoleFromAXRole:node_->GetData().role];
504 } 508 }
505 509
506 - (NSString*)AXRoleDescription { 510 - (NSString*)AXRoleDescription {
507 switch (node_->GetData().role) { 511 switch (node_->GetData().role) {
508 case ui::AX_ROLE_TAB: 512 case ui::AX_ROLE_TAB:
dmazzoni 2017/06/23 18:20:11 We could add the custom role description here, and
je_julie 2017/06/26 12:27:37 I updated role description here and browser_access
509 // There is no NSAccessibilityTabRole or similar (AXRadioButton is used 513 // There is no NSAccessibilityTabRole or similar (AXRadioButton is used
510 // instead). Do the same as NSTabView and put "tab" in the description. 514 // instead). Do the same as NSTabView and put "tab" in the description.
511 return [l10n_util::GetNSStringWithFixup(IDS_ACCNAME_TAB_ROLE_DESCRIPTION) 515 return [l10n_util::GetNSStringWithFixup(IDS_ACCNAME_TAB_ROLE_DESCRIPTION)
512 lowercaseString]; 516 lowercaseString];
513 default: 517 default:
514 break; 518 break;
515 } 519 }
516 return NSAccessibilityRoleDescription([self AXRole], [self AXSubrole]); 520 return NSAccessibilityRoleDescription([self AXRole], [self AXSubrole]);
517 } 521 }
518 522
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
687 } 691 }
688 NotifyMacEvent(native_node_, event_type); 692 NotifyMacEvent(native_node_, event_type);
689 } 693 }
690 694
691 int AXPlatformNodeMac::GetIndexInParent() { 695 int AXPlatformNodeMac::GetIndexInParent() {
692 // TODO(dmazzoni): implement this. http://crbug.com/396137 696 // TODO(dmazzoni): implement this. http://crbug.com/396137
693 return -1; 697 return -1;
694 } 698 }
695 699
696 } // namespace ui 700 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698