| Index: ui/views/accessibility/native_view_accessibility_base.cc
|
| diff --git a/ui/views/accessibility/native_view_accessibility_base.cc b/ui/views/accessibility/native_view_accessibility_base.cc
|
| index 2ed7e26fafaed75d104c732a70d5a6ee1dc336f5..b1feda15fed7f03f4589ae7ac0405febe6064a5e 100644
|
| --- a/ui/views/accessibility/native_view_accessibility_base.cc
|
| +++ b/ui/views/accessibility/native_view_accessibility_base.cc
|
| @@ -40,13 +40,12 @@ void NativeViewAccessibilityBase::NotifyAccessibilityEvent(
|
|
|
| const ui::AXNodeData& NativeViewAccessibilityBase::GetData() const {
|
| data_ = ui::AXNodeData();
|
| - data_.state = 0;
|
|
|
| // Views may misbehave if their widget is closed; return an unknown role
|
| // rather than possibly crashing.
|
| if (!view_->GetWidget() || view_->GetWidget()->IsClosed()) {
|
| data_.role = ui::AX_ROLE_UNKNOWN;
|
| - data_.state = 1 << ui::AX_STATE_DISABLED;
|
| + data_.AddState(ui::AX_STATE_DISABLED);
|
| return data_;
|
| }
|
|
|
| @@ -58,13 +57,13 @@ const ui::AXNodeData& NativeViewAccessibilityBase::GetData() const {
|
| base::UTF16ToUTF8(description));
|
|
|
| if (view_->IsAccessibilityFocusable())
|
| - data_.state |= (1 << ui::AX_STATE_FOCUSABLE);
|
| + data_.AddState(ui::AX_STATE_FOCUSABLE);
|
|
|
| if (!view_->enabled())
|
| - data_.state |= (1 << ui::AX_STATE_DISABLED);
|
| + data_.AddState(ui::AX_STATE_DISABLED);
|
|
|
| if (!view_->IsDrawn())
|
| - data_.state |= (1 << ui::AX_STATE_INVISIBLE);
|
| + data_.AddState(ui::AX_STATE_INVISIBLE);
|
|
|
| return data_;
|
| }
|
|
|