| Index: ui/views/accessibility/native_view_accessibility.cc
|
| diff --git a/ui/views/accessibility/native_view_accessibility.cc b/ui/views/accessibility/native_view_accessibility.cc
|
| index 891d2cc3f50ec9d488fa4ba76ce4f66b52583846..4cb379638ce9f78c121fe412afebe13bd47d125c 100644
|
| --- a/ui/views/accessibility/native_view_accessibility.cc
|
| +++ b/ui/views/accessibility/native_view_accessibility.cc
|
| @@ -14,37 +14,25 @@
|
|
|
| namespace views {
|
|
|
| -#if !defined(PLATFORM_HAS_NATIVE_VIEW_ACCESSIBILITY_IMPL)
|
| -// static
|
| -std::unique_ptr<NativeViewAccessibility> NativeViewAccessibility::Create(
|
| - View* view) {
|
| - // Use WrapUnique over MakeUnique to invoke the protected constructor.
|
| - return base::WrapUnique<NativeViewAccessibility>(
|
| - new NativeViewAccessibility(view));
|
| -}
|
| -#endif // !defined(PLATFORM_HAS_NATIVE_VIEW_ACCESSIBILITY_IMPL)
|
| -
|
| NativeViewAccessibility::NativeViewAccessibility(View* view)
|
| : view_(view),
|
| parent_widget_(nullptr),
|
| - ax_node_(nullptr) {
|
| - ax_node_ = ui::AXPlatformNode::Create(this);
|
| + ax_node_(ui::AXPlatformNode::Create(this)) {
|
| + DCHECK(ax_node_);
|
| }
|
|
|
| NativeViewAccessibility::~NativeViewAccessibility() {
|
| - if (ax_node_)
|
| - ax_node_->Destroy();
|
| + ax_node_->Destroy();
|
| if (parent_widget_)
|
| parent_widget_->RemoveObserver(this);
|
| }
|
|
|
| gfx::NativeViewAccessible NativeViewAccessibility::GetNativeObject() {
|
| - return ax_node_ ? ax_node_->GetNativeViewAccessible() : nullptr;
|
| + return ax_node_->GetNativeViewAccessible();
|
| }
|
|
|
| void NativeViewAccessibility::NotifyAccessibilityEvent(ui::AXEvent event_type) {
|
| - if (ax_node_)
|
| - ax_node_->NotifyAccessibilityEvent(event_type);
|
| + ax_node_->NotifyAccessibilityEvent(event_type);
|
| }
|
|
|
| bool NativeViewAccessibility::SetFocused(bool focused) {
|
|
|