content/browser/accessibility/browser_accessibility_cocoa.mm - Issue 642313003: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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 side-by-side diff with in-line comments

Download patch

« content/browser/accessibility/accessibility_win_browsertest.cc ('K') | « content/browser/accessibility/browser_accessibility_android.cc ('k') | content/browser/accessibility/browser_accessibility_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/accessibility/browser_accessibility_cocoa.mm

diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm

index 75c3ff1fe831d4e596d28318035c7bd7dabb647b..921acf9a497c202b1e75cd0eb2a745debdabd951 100644

--- a/content/browser/accessibility/browser_accessibility_cocoa.mm

+++ b/content/browser/accessibility/browser_accessibility_cocoa.mm

@@ -134,7 +134,7 @@ NSDictionary* attributeToMethodNameMap = nil;

- (void)detach {

if (browserAccessibility_) {

NSAccessibilityUnregisterUniqueIdForUIElement(self);

- browserAccessibility_ = NULL;

+ browserAccessibility_ = nullptr;

}

@@ -332,7 +332,7 @@ NSDictionary* attributeToMethodNameMap = nil;

- (NSNumber*)focused {

BrowserAccessibilityManager* manager = browserAccessibility_->manager();

NSNumber* ret = [NSNumber numberWithBool:

- manager->GetFocus(NULL) == browserAccessibility_];

+ manager->GetFocus(nullptr) == browserAccessibility_];

return ret;

}

@@ -387,7 +387,7 @@ NSDictionary* attributeToMethodNameMap = nil;

- (NSString*)invalid {

base::string16 invalidUTF;

if (!browserAccessibility_->GetHtmlAttribute("aria-invalid", &invalidUTF))

- return NULL;

+ return nullptr;

NSString* invalid = base::SysUTF16ToNSString(invalidUTF);

if ([invalid isEqualToString:@"false"] ||

[invalid isEqualToString:@""]) {