Chromium Code Reviews| Index: content/browser/accessibility/browser_accessibility_manager_mac.mm |
| diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm |
| index e43122e120b781bb679f08817e1d4323d9e8b73a..337ac2530773f74a95da6118a8a6a3ae6e650008 100644 |
| --- a/content/browser/accessibility/browser_accessibility_manager_mac.mm |
| +++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm |
| @@ -145,20 +145,6 @@ void BrowserAccessibilityManagerMac::NotifyAccessibilityEvent( |
| if (!node->IsNative()) |
| return; |
| - if (event_type == ui::AX_EVENT_FOCUS) { |
| - BrowserAccessibility* active_descendant = GetActiveDescendantFocus(node); |
| - if (active_descendant) |
| - node = active_descendant; |
| - |
| - if (node->GetRole() == ui::AX_ROLE_LIST_BOX_OPTION && |
| - node->HasState(ui::AX_STATE_SELECTED) && |
| - node->GetParent() && |
| - node->GetParent()->GetRole() == ui::AX_ROLE_LIST_BOX) { |
| - node = node->GetParent(); |
| - SetFocus(*node); |
| - } |
| - } |
| - |
| auto native_node = ToBrowserAccessibilityCocoa(node); |
| DCHECK(native_node); |
| @@ -175,6 +161,10 @@ void BrowserAccessibilityManagerMac::NotifyAccessibilityEvent( |
| mac_notification = NSAccessibilitySelectedChildrenChangedNotification; |
| } else { |
| mac_notification = NSAccessibilityFocusedUIElementChangedNotification; |
| + BrowserAccessibility* focus = GetFocus(); |
| + if (!focus) |
| + return; |
| + native_node = ToBrowserAccessibilityCocoa(focus); |
|
dmazzoni
2016/04/26 20:24:24
I wonder, is this maybe not necessary now?
After
|
| } |
| break; |
| case ui::AX_EVENT_AUTOCORRECTION_OCCURED: |