| Index: content/browser/accessibility/browser_accessibility.cc
|
| diff --git a/content/browser/accessibility/browser_accessibility.cc b/content/browser/accessibility/browser_accessibility.cc
|
| index a700e9a9fd30538f4703fdf92d837a50058eb2c0..34ae14d5cc9a5d9e3932ea77bcfd0d0509182787 100644
|
| --- a/content/browser/accessibility/browser_accessibility.cc
|
| +++ b/content/browser/accessibility/browser_accessibility.cc
|
| @@ -25,8 +25,8 @@ BrowserAccessibility* BrowserAccessibility::Create() {
|
| #endif
|
|
|
| BrowserAccessibility::BrowserAccessibility()
|
| - : manager_(NULL),
|
| - node_(NULL) {
|
| + : manager_(nullptr),
|
| + node_(nullptr) {
|
| }
|
|
|
| BrowserAccessibility::~BrowserAccessibility() {
|
| @@ -100,7 +100,7 @@ BrowserAccessibility* BrowserAccessibility::GetPreviousSibling() {
|
| if (GetParent() && GetIndexInParent() > 0)
|
| return GetParent()->InternalGetChild(GetIndexInParent() - 1);
|
|
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| BrowserAccessibility* BrowserAccessibility::GetNextSibling() {
|
| @@ -111,7 +111,7 @@ BrowserAccessibility* BrowserAccessibility::GetNextSibling() {
|
| return GetParent()->InternalGetChild(GetIndexInParent() + 1);
|
| }
|
|
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| uint32 BrowserAccessibility::InternalChildCount() const {
|
| @@ -123,24 +123,24 @@ uint32 BrowserAccessibility::InternalChildCount() const {
|
| BrowserAccessibility* BrowserAccessibility::InternalGetChild(
|
| uint32 child_index) const {
|
| if (!node_ || !manager_)
|
| - return NULL;
|
| + return nullptr;
|
| return manager_->GetFromAXNode(node_->children()[child_index]);
|
| }
|
|
|
| BrowserAccessibility* BrowserAccessibility::GetParent() const {
|
| if (!node_ || !manager_)
|
| - return NULL;
|
| + return nullptr;
|
| ui::AXNode* parent = node_->parent();
|
| if (parent)
|
| return manager_->GetFromAXNode(parent);
|
|
|
| if (!manager_->delegate())
|
| - return NULL;
|
| + return nullptr;
|
|
|
| BrowserAccessibility* host_node =
|
| manager_->delegate()->AccessibilityGetParentFrame();
|
| if (!host_node)
|
| - return NULL;
|
| + return nullptr;
|
|
|
| return host_node->GetParent();
|
| }
|
| @@ -340,9 +340,9 @@ gfx::Rect BrowserAccessibility::GetGlobalBoundsForRange(int start, int len)
|
| BrowserAccessibility* BrowserAccessibility::BrowserAccessibilityForPoint(
|
| const gfx::Point& point) {
|
| // The best result found that's a child of this object.
|
| - BrowserAccessibility* child_result = NULL;
|
| + BrowserAccessibility* child_result = nullptr;
|
| // The best result that's an indirect descendant like grandchild, etc.
|
| - BrowserAccessibility* descendant_result = NULL;
|
| + BrowserAccessibility* descendant_result = nullptr;
|
|
|
| // Walk the children recursively looking for the BrowserAccessibility that
|
| // most tightly encloses the specified point. Walk backwards so that in
|
| @@ -388,8 +388,8 @@ void BrowserAccessibility::Destroy() {
|
| value_.clear();
|
|
|
| manager_->NotifyAccessibilityEvent(ui::AX_EVENT_HIDE, this);
|
| - node_ = NULL;
|
| - manager_ = NULL;
|
| + node_ = nullptr;
|
| + manager_ = nullptr;
|
|
|
| NativeReleaseReference();
|
| }
|
|
|