content/browser/accessibility/browser_accessibility_manager_android.cc - 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_manager_android.cc

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_manager.cc ('k') | content/browser/accessibility/browser_accessibility_manager_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/accessibility/browser_accessibility_manager_android.cc

diff --git a/content/browser/accessibility/browser_accessibility_manager_android.cc b/content/browser/accessibility/browser_accessibility_manager_android.cc

index 678bd693cca556b7784678d7a205225210a923ba..19e814d0168fa13ed977961dafd813cb53130ffb 100644

--- a/content/browser/accessibility/browser_accessibility_manager_android.cc

+++ b/content/browser/accessibility/browser_accessibility_manager_android.cc

@@ -194,7 +194,7 @@ jint BrowserAccessibilityManagerAndroid::GetRootId(JNIEnv* env, jobject obj) {

jboolean BrowserAccessibilityManagerAndroid::IsNodeValid(

JNIEnv* env, jobject obj, jint id) {

- return GetFromID(id) != NULL;

+ return GetFromID(id) != nullptr;

}

void BrowserAccessibilityManagerAndroid::HitTest(

@@ -245,7 +245,7 @@ jboolean BrowserAccessibilityManagerAndroid::PopulateAccessibilityNodeInfo(

gfx::Rect parent_rect = node->GetParent()->GetLocalBoundsRect();

parent_relative_rect.Offset(-parent_rect.OffsetFromOrigin());

}

- bool is_root = node->GetParent() == NULL;

+ bool is_root = node->GetParent() == nullptr;

Java_BrowserAccessibilityManager_setAccessibilityNodeInfoLocation(

env, obj, info,

id,