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

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

Issue 642313003: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Including id in the AUTHORS file. Created 6 years, 2 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 (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 6
7 #import "content/browser/accessibility/browser_accessibility_cocoa.h" 7 #import "content/browser/accessibility/browser_accessibility_cocoa.h"
8 8
9 #include <map> 9 #include <map>
10 10
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 127
128 - (id)initWithObject:(BrowserAccessibility*)accessibility { 128 - (id)initWithObject:(BrowserAccessibility*)accessibility {
129 if ((self = [super init])) 129 if ((self = [super init]))
130 browserAccessibility_ = accessibility; 130 browserAccessibility_ = accessibility;
131 return self; 131 return self;
132 } 132 }
133 133
134 - (void)detach { 134 - (void)detach {
135 if (browserAccessibility_) { 135 if (browserAccessibility_) {
136 NSAccessibilityUnregisterUniqueIdForUIElement(self); 136 NSAccessibilityUnregisterUniqueIdForUIElement(self);
137 browserAccessibility_ = NULL; 137 browserAccessibility_ = nullptr;
138 } 138 }
139 } 139 }
140 140
141 - (NSString*)accessKey { 141 - (NSString*)accessKey {
142 return NSStringForStringAttribute( 142 return NSStringForStringAttribute(
143 browserAccessibility_, ui::AX_ATTR_ACCESS_KEY); 143 browserAccessibility_, ui::AX_ATTR_ACCESS_KEY);
144 } 144 }
145 145
146 - (NSNumber*)ariaAtomic { 146 - (NSNumber*)ariaAtomic {
147 bool boolValue = browserAccessibility_->GetBoolAttribute( 147 bool boolValue = browserAccessibility_->GetBoolAttribute(
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 } 325 }
326 326
327 - (NSNumber*)enabled { 327 - (NSNumber*)enabled {
328 return [NSNumber numberWithBool: 328 return [NSNumber numberWithBool:
329 GetState(browserAccessibility_, ui::AX_STATE_ENABLED)]; 329 GetState(browserAccessibility_, ui::AX_STATE_ENABLED)];
330 } 330 }
331 331
332 - (NSNumber*)focused { 332 - (NSNumber*)focused {
333 BrowserAccessibilityManager* manager = browserAccessibility_->manager(); 333 BrowserAccessibilityManager* manager = browserAccessibility_->manager();
334 NSNumber* ret = [NSNumber numberWithBool: 334 NSNumber* ret = [NSNumber numberWithBool:
335 manager->GetFocus(NULL) == browserAccessibility_]; 335 manager->GetFocus(nullptr) == browserAccessibility_];
336 return ret; 336 return ret;
337 } 337 }
338 338
339 - (id)header { 339 - (id)header {
340 int headerElementId = -1; 340 int headerElementId = -1;
341 if ([self internalRole] == ui::AX_ROLE_TABLE || 341 if ([self internalRole] == ui::AX_ROLE_TABLE ||
342 [self internalRole] == ui::AX_ROLE_GRID) { 342 [self internalRole] == ui::AX_ROLE_GRID) {
343 browserAccessibility_->GetIntAttribute( 343 browserAccessibility_->GetIntAttribute(
344 ui::AX_ATTR_TABLE_HEADER_ID, &headerElementId); 344 ui::AX_ATTR_TABLE_HEADER_ID, &headerElementId);
345 } else if ([self internalRole] == ui::AX_ROLE_COLUMN) { 345 } else if ([self internalRole] == ui::AX_ROLE_COLUMN) {
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 380
381 // Returns whether or not this node should be ignored in the 381 // Returns whether or not this node should be ignored in the
382 // accessibility tree. 382 // accessibility tree.
383 - (BOOL)isIgnored { 383 - (BOOL)isIgnored {
384 return [[self role] isEqualToString:NSAccessibilityUnknownRole]; 384 return [[self role] isEqualToString:NSAccessibilityUnknownRole];
385 } 385 }
386 386
387 - (NSString*)invalid { 387 - (NSString*)invalid {
388 base::string16 invalidUTF; 388 base::string16 invalidUTF;
389 if (!browserAccessibility_->GetHtmlAttribute("aria-invalid", &invalidUTF)) 389 if (!browserAccessibility_->GetHtmlAttribute("aria-invalid", &invalidUTF))
390 return NULL; 390 return nullptr;
391 NSString* invalid = base::SysUTF16ToNSString(invalidUTF); 391 NSString* invalid = base::SysUTF16ToNSString(invalidUTF);
392 if ([invalid isEqualToString:@"false"] || 392 if ([invalid isEqualToString:@"false"] ||
393 [invalid isEqualToString:@""]) { 393 [invalid isEqualToString:@""]) {
394 return @"false"; 394 return @"false";
395 } 395 }
396 return invalid; 396 return invalid;
397 } 397 }
398 398
399 - (void)addLinkedUIElementsFromAttribute:(ui::AXIntListAttribute)attribute 399 - (void)addLinkedUIElementsFromAttribute:(ui::AXIntListAttribute)attribute
400 addTo:(NSMutableArray*)outArray { 400 addTo:(NSMutableArray*)outArray {
(...skipping 1045 matching lines...) Expand 10 before | Expand all | Expand 10 after
1446 return [super hash]; 1446 return [super hash];
1447 return browserAccessibility_->GetId(); 1447 return browserAccessibility_->GetId();
1448 } 1448 }
1449 1449
1450 - (BOOL)accessibilityShouldUseUniqueId { 1450 - (BOOL)accessibilityShouldUseUniqueId {
1451 return YES; 1451 return YES;
1452 } 1452 }
1453 1453
1454 @end 1454 @end
1455 1455
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698