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

Unified Diff: content/browser/accessibility/browser_accessibility_manager_win.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
Index: content/browser/accessibility/browser_accessibility_manager_win.cc
diff --git a/content/browser/accessibility/browser_accessibility_manager_win.cc b/content/browser/accessibility/browser_accessibility_manager_win.cc
index b7424870cea93a3dae7302f5b9dc0662539c9b8e..ebc835d977063b232c261e6dcafad0df89081698 100644
--- a/content/browser/accessibility/browser_accessibility_manager_win.cc
+++ b/content/browser/accessibility/browser_accessibility_manager_win.cc
@@ -33,7 +33,7 @@ BrowserAccessibilityManagerWin::BrowserAccessibilityManagerWin(
BrowserAccessibilityDelegate* delegate,
BrowserAccessibilityFactory* factory)
: BrowserAccessibilityManager(delegate, factory),
- tracked_scroll_object_(NULL),
+ tracked_scroll_object_(nullptr),
focus_event_on_root_needed_(false) {
ui::win::CreateATLModuleIfNeeded();
Initialize(initial_tree);
@@ -42,7 +42,7 @@ BrowserAccessibilityManagerWin::BrowserAccessibilityManagerWin(
BrowserAccessibilityManagerWin::~BrowserAccessibilityManagerWin() {
if (tracked_scroll_object_) {
tracked_scroll_object_->Release();
- tracked_scroll_object_ = NULL;
+ tracked_scroll_object_ = nullptr;
}
}
@@ -63,13 +63,13 @@ ui::AXTreeUpdate BrowserAccessibilityManagerWin::GetEmptyDocument() {
HWND BrowserAccessibilityManagerWin::GetParentHWND() {
if (!delegate_)
- return NULL;
+ return nullptr;
return delegate_->AccessibilityGetAcceleratedWidget();
}
IAccessible* BrowserAccessibilityManagerWin::GetParentIAccessible() {
if (!delegate_)
- return NULL;
+ return nullptr;
return delegate_->AccessibilityGetNativeViewAccessible();
}
@@ -102,7 +102,7 @@ void BrowserAccessibilityManagerWin::OnNodeWillBeDeleted(ui::AXNode* node) {
obj->ToBrowserAccessibilityWin()->unique_id_win());
if (obj == tracked_scroll_object_) {
tracked_scroll_object_->Release();
- tracked_scroll_object_ = NULL;
+ tracked_scroll_object_ = nullptr;
}
}
@@ -258,7 +258,7 @@ void BrowserAccessibilityManagerWin::NotifyAccessibilityEvent(
IA2_EVENT_VISIBLE_DATA_CHANGED,
tracked_scroll_object_->ToBrowserAccessibilityWin()->unique_id_win());
tracked_scroll_object_->Release();
- tracked_scroll_object_ = NULL;
+ tracked_scroll_object_ = nullptr;
}
}
@@ -285,7 +285,7 @@ BrowserAccessibilityWin* BrowserAccessibilityManagerWin::GetFromUniqueIdWin(
if (result)
return result->ToBrowserAccessibilityWin();
}
- return NULL;
+ return nullptr;
}
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698