Change condition for adding AX_STATE_EXPANDED

content/renderer/accessibility/blink_ax_enum_conversion.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/accessibility/blink_ax_enum_conversion.h"
 
 #include "base/logging.h"
 
 namespace content {
 
 uint32 AXStateFromBlink(const blink::WebAXObject& o) {
   uint32 state = 0;
   if (o.isChecked())
     state |= (1 << ui::AX_STATE_CHECKED);
 
-  if (o.isCollapsed())
-    state |= (1 << ui::AX_STATE_COLLAPSED);
+  blink::WebAXExpanded expanded = o.isExpanded();
+  if (expanded) {
+    if (expanded == blink::WebAXExpandedCollapsed)
+      state |= (1 << ui::AX_STATE_COLLAPSED);
+    else if (expanded == blink::WebAXExpandedExpanded)
+      state |= (1 << ui::AX_STATE_EXPANDED);
+  }
 
   if (o.canSetFocusAttribute())
     state |= (1 << ui::AX_STATE_FOCUSABLE);
 
   if (o.isFocused())
     state |= (1 << ui::AX_STATE_FOCUSED);
 
   if (o.role() == blink::WebAXRolePopUpButton ||
-      o.ariaHasPopup()) {
+      o.ariaHasPopup())
     state |= (1 << ui::AX_STATE_HASPOPUP);
-    if (!o.isCollapsed())
-      state |= (1 << ui::AX_STATE_EXPANDED);
-  }
 
   if (o.isHovered())
     state |= (1 << ui::AX_STATE_HOVERED);
 
   if (o.isIndeterminate())
     state |= (1 << ui::AX_STATE_INDETERMINATE);
 
   if (!o.isVisible())
     state |= (1 << ui::AX_STATE_INVISIBLE);
 
@@ skipping 369 matching lines @@
     case blink::WebAXTextDirectionBT:
       return ui::AX_TEXT_DIRECTION_BT;
     default:
       NOTREACHED();
   }
 
   return ui::AX_TEXT_DIRECTION_NONE;
 }
 
 }  // namespace content