Merge to m48: Stops using SYSTEM_STATE_INDETERMINATE as it makes radio buttons appear to have a mix…

ui/accessibility/ax_node_data.cc

 // Copyright 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 "ui/accessibility/ax_node_data.h"
 
 #include <set>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 258 matching lines @@
   if (state & (1 << AX_STATE_EXPANDED))
     result += " EXPANDED";
   if (state & (1 << AX_STATE_FOCUSABLE))
     result += " FOCUSABLE";
   if (state & (1 << AX_STATE_FOCUSED))
     result += " FOCUSED";
   if (state & (1 << AX_STATE_HASPOPUP))
     result += " HASPOPUP";
   if (state & (1 << AX_STATE_HOVERED))
     result += " HOVERED";
-  if (state & (1 << AX_STATE_INDETERMINATE))
-    result += " INDETERMINATE";
   if (state & (1 << AX_STATE_INVISIBLE))
     result += " INVISIBLE";
   if (state & (1 << AX_STATE_LINKED))
     result += " LINKED";
   if (state & (1 << AX_STATE_MULTISELECTABLE))
     result += " MULTISELECTABLE";
   if (state & (1 << AX_STATE_OFFSCREEN))
     result += " OFFSCREEN";
   if (state & (1 << AX_STATE_PRESSED))
     result += " PRESSED";
@@ skipping 257 matching lines @@
         result += " font_size=" + value;
         break;
       case AX_FLOAT_ATTRIBUTE_NONE:
         break;
     }
   }
 
   for (size_t i = 0; i < bool_attributes.size(); ++i) {
     std::string value = bool_attributes[i].second ? "true" : "false";
     switch (bool_attributes[i].first) {
-      case AX_ATTR_BUTTON_MIXED:
+      case AX_ATTR_STATE_MIXED:
         result += " mixed=" + value;
         break;
       case AX_ATTR_LIVE_ATOMIC:
         result += " atomic=" + value;
         break;
       case AX_ATTR_LIVE_BUSY:
         result += " busy=" + value;
         break;
       case AX_ATTR_CONTAINER_LIVE_ATOMIC:
         result += " container_atomic=" + value;
@@ skipping 71 matching lines @@
 bool AXNodeData::IsRoot() const {
   return (role == AX_ROLE_ROOT_WEB_AREA ||
           role == AX_ROLE_DESKTOP);
 }
 
 void AXNodeData::SetRoot() {
   role = AX_ROLE_ROOT_WEB_AREA;
 }
 
 }  // namespace ui