| Index: ui/views/view.cc
|
| diff --git a/ui/views/view.cc b/ui/views/view.cc
|
| index 3da5ce03e9bebc312f4d49c315c256f4c895cf69..70f394c0a6b0980c2bb49e13db681c22e58a9d57 100644
|
| --- a/ui/views/view.cc
|
| +++ b/ui/views/view.cc
|
| @@ -1321,12 +1321,16 @@ bool View::ExceededDragThreshold(const gfx::Vector2d& delta) {
|
|
|
| // Accessibility----------------------------------------------------------------
|
|
|
| -gfx::NativeViewAccessible View::GetNativeViewAccessible() {
|
| +NativeViewAccessibility* View::GetNativeViewAccessibility() {
|
| if (!native_view_accessibility_)
|
| native_view_accessibility_ = NativeViewAccessibility::Create(this);
|
| - if (native_view_accessibility_)
|
| - return native_view_accessibility_->GetNativeObject();
|
| - return NULL;
|
| + return native_view_accessibility_;
|
| +}
|
| +
|
| +gfx::NativeViewAccessible View::GetNativeViewAccessible() {
|
| + if (GetNativeViewAccessibility())
|
| + return GetNativeViewAccessibility()->GetNativeObject();
|
| + return nullptr;
|
| }
|
|
|
| void View::NotifyAccessibilityEvent(
|
| @@ -1336,10 +1340,8 @@ void View::NotifyAccessibilityEvent(
|
| ViewsDelegate::GetInstance()->NotifyAccessibilityEvent(this, event_type);
|
|
|
| if (send_native_event && GetWidget()) {
|
| - if (!native_view_accessibility_)
|
| - native_view_accessibility_ = NativeViewAccessibility::Create(this);
|
| - if (native_view_accessibility_)
|
| - native_view_accessibility_->NotifyAccessibilityEvent(event_type);
|
| + if (GetNativeViewAccessibility())
|
| + GetNativeViewAccessibility()->NotifyAccessibilityEvent(event_type);
|
| }
|
| }
|
|
|
|
|