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

Side by Side Diff: content/browser/accessibility/browser_accessibility_cocoa.mm

Issue 2253863002: Fix accessibility constant clash in OSX 10.12. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Applied feedback. Created 4 years, 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <execinfo.h> 5 #include <execinfo.h>
6 #include <stddef.h> 6 #include <stddef.h>
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #import "content/browser/accessibility/browser_accessibility_cocoa.h" 9 #import "content/browser/accessibility/browser_accessibility_cocoa.h"
10 10
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 NSString* const NSAccessibilityARIAPosInSetAttribute = @"AXARIAPosInSet"; 46 NSString* const NSAccessibilityARIAPosInSetAttribute = @"AXARIAPosInSet";
47 NSString* const NSAccessibilityARIARelevantAttribute = @"AXARIARelevant"; 47 NSString* const NSAccessibilityARIARelevantAttribute = @"AXARIARelevant";
48 NSString* const NSAccessibilityARIASetSizeAttribute = @"AXARIASetSize"; 48 NSString* const NSAccessibilityARIASetSizeAttribute = @"AXARIASetSize";
49 NSString* const NSAccessibilityAccessKeyAttribute = @"AXAccessKey"; 49 NSString* const NSAccessibilityAccessKeyAttribute = @"AXAccessKey";
50 NSString* const NSAccessibilityDropEffectsAttribute = @"AXDropEffects"; 50 NSString* const NSAccessibilityDropEffectsAttribute = @"AXDropEffects";
51 NSString* const NSAccessibilityGrabbedAttribute = @"AXGrabbed"; 51 NSString* const NSAccessibilityGrabbedAttribute = @"AXGrabbed";
52 NSString* const NSAccessibilityInvalidAttribute = @"AXInvalid"; 52 NSString* const NSAccessibilityInvalidAttribute = @"AXInvalid";
53 NSString* const NSAccessibilityIsMultiSelectableAttribute = 53 NSString* const NSAccessibilityIsMultiSelectableAttribute =
54 @"AXIsMultiSelectable"; 54 @"AXIsMultiSelectable";
55 NSString* const NSAccessibilityLoadingProgressAttribute = @"AXLoadingProgress"; 55 NSString* const NSAccessibilityLoadingProgressAttribute = @"AXLoadingProgress";
56 NSString* const NSAccessibilityRequiredAttribute = @"AXRequired";
57 NSString* const 56 NSString* const
58 NSAccessibilityUIElementCountForSearchPredicateParameterizedAttribute = 57 NSAccessibilityUIElementCountForSearchPredicateParameterizedAttribute =
59 @"AXUIElementCountForSearchPredicate"; 58 @"AXUIElementCountForSearchPredicate";
60 NSString* const 59 NSString* const
61 NSAccessibilityUIElementsForSearchPredicateParameterizedAttribute = 60 NSAccessibilityUIElementsForSearchPredicateParameterizedAttribute =
62 @"AXUIElementsForSearchPredicate"; 61 @"AXUIElementsForSearchPredicate";
63 NSString* const NSAccessibilityVisitedAttribute = @"AXVisited"; 62 NSString* const NSAccessibilityVisitedAttribute = @"AXVisited";
64 63
65 // Private attributes for text markers. 64 // Private attributes for text markers.
66 NSString* const NSAccessibilityStartTextMarkerAttribute = @"AXStartTextMarker"; 65 NSString* const NSAccessibilityStartTextMarkerAttribute = @"AXStartTextMarker";
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 search->AddPredicate(predicate); 496 search->AddPredicate(predicate);
498 } 497 }
499 } 498 }
500 } 499 }
501 500
502 return true; 501 return true;
503 } 502 }
504 503
505 } // namespace 504 } // namespace
506 505
506 // The following private WebKit accessibility attribute became public in 10.12.
507 #if !defined(MAC_OS_X_VERSION_10_12) || \
508 MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12
509 extern "C" {
510 NSString* const NSAccessibilityRequiredAttribute = @"AXRequired";
511 }
512 #endif // MAC_OS_X_VERSION_10_12
513
507 @implementation BrowserAccessibilityCocoa 514 @implementation BrowserAccessibilityCocoa
508 515
509 + (void)initialize { 516 + (void)initialize {
510 const struct { 517 const struct {
511 NSString* attribute; 518 NSString* attribute;
512 NSString* methodName; 519 NSString* methodName;
513 } attributeToMethodNameContainer[] = { 520 } attributeToMethodNameContainer[] = {
514 {NSAccessibilityARIAAtomicAttribute, @"ariaAtomic"}, 521 {NSAccessibilityARIAAtomicAttribute, @"ariaAtomic"},
515 {NSAccessibilityARIABusyAttribute, @"ariaBusy"}, 522 {NSAccessibilityARIABusyAttribute, @"ariaBusy"},
516 {NSAccessibilityARIALiveAttribute, @"ariaLive"}, 523 {NSAccessibilityARIALiveAttribute, @"ariaLive"},
(...skipping 2334 matching lines...) Expand 10 before | Expand all | Expand 10 after
2851 if (![self instanceActive]) 2858 if (![self instanceActive])
2852 return [super hash]; 2859 return [super hash];
2853 return browserAccessibility_->GetId(); 2860 return browserAccessibility_->GetId();
2854 } 2861 }
2855 2862
2856 - (BOOL)accessibilityShouldUseUniqueId { 2863 - (BOOL)accessibilityShouldUseUniqueId {
2857 return YES; 2864 return YES;
2858 } 2865 }
2859 2866
2860 @end 2867 @end
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698