Added the aria-sort state to the accessibility tree.

content/browser/accessibility/browser_accessibility_win.cc

 // Copyright (c) 2012 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/browser/accessibility/browser_accessibility_win.h"
 
 #include <UIAutomationClient.h>
 #include <UIAutomationCoreApi.h>
 
 #include "base/strings/string_number_conversions.h"
@@ skipping 3020 matching lines @@
       }
     }
   }
 
   // Expose invalid state for form controls and elements with aria-invalid.
   int invalid_state;
   if (GetIntAttribute(ui::AX_ATTR_INVALID_STATE, &invalid_state)) {
     // TODO(nektar): Handle the possibility of having multiple aria-invalid
     // attributes defined, e.g., "invalid:spelling,grammar".
     switch (invalid_state) {
-      case ui::AX_INVALID_STATE_NONE:
-        break;
       case ui::AX_INVALID_STATE_FALSE:
         win_attributes_->ia2_attributes.push_back(L"invalid:false");
         break;
       case ui::AX_INVALID_STATE_TRUE:
         win_attributes_->ia2_attributes.push_back(L"invalid:true");
         break;
       case ui::AX_INVALID_STATE_SPELLING:
         win_attributes_->ia2_attributes.push_back(L"invalid:spelling");
         break;
       case ui::AX_INVALID_STATE_GRAMMAR:
@@ skipping 10 matching lines @@
             // Set the attribute to L"true", since we cannot be more specific.
             win_attributes_->ia2_attributes.push_back(L"invalid:true");
           }
         }
         break;
       default:
         NOTREACHED();
     }
   }
 
+  // Expose row or column header sort direction.
+  int32 sort_direction;
+  if ((ia_role() == ROLE_SYSTEM_COLUMNHEADER ||
+      ia_role() == ROLE_SYSTEM_ROWHEADER) &&
+      GetIntAttribute(ui::AX_ATTR_SORT_DIRECTION, &sort_direction)) {
+    switch (sort_direction) {
+      case ui::AX_SORT_DIRECTION_UNSORTED:
+        win_attributes_->ia2_attributes.push_back(L"sort:none");
+        break;
+      case ui::AX_SORT_DIRECTION_ASCENDING:
+        win_attributes_->ia2_attributes.push_back(L"sort:ascending");
+        break;
+      case ui::AX_SORT_DIRECTION_DESCENDING:
+        win_attributes_->ia2_attributes.push_back(L"sort:descending");
+        break;
+      case ui::AX_SORT_DIRECTION_OTHER:
+        win_attributes_->ia2_attributes.push_back(L"sort:other");
+        break;
+      default:
+        NOTREACHED();
+    }
+  }
+
   // The calculation of the accessible name of an element has been
   // standardized in the HTML to Platform Accessibility APIs Implementation
   // Guide (http://www.w3.org/TR/html-aapi/). In order to return the
   // appropriate accessible name on Windows, we need to apply some logic
   // to the fields we get from WebKit.
   //
   // TODO(dmazzoni): move most of this logic into WebKit.
   //
   // WebKit gives us:
   //
@@ skipping 1006 matching lines @@
     ia2_role = ia_role;
 
   win_attributes_->ia_role = ia_role;
   win_attributes_->ia_state = ia_state;
   win_attributes_->role_name = role_name;
   win_attributes_->ia2_role = ia2_role;
   win_attributes_->ia2_state = ia2_state;
 }
 
 }  // namespace content