Adds MSAA information to various (previously uncovered) bits of the UI, inclu...

views/accessibility/view_accessibility.cc

 // Copyright (c) 2006-2008 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 "views/accessibility/view_accessibility.h"
 
 #include "views/accessibility/view_accessibility_wrapper.h"
 #include "views/widget/widget.h"
 
 HRESULT ViewAccessibility::Initialize(views::View* view) {
@@ skipping 596 matching lines @@
 
   // Add on any view-specific states.
   AccessibilityTypes::State state;
   view->GetAccessibleState(&state);
 
   msaa_state->lVal |= MSAAState(state);
 }
 
 long ViewAccessibility::MSAARole(AccessibilityTypes::Role role) {
   switch (role) {
-    case AccessibilityTypes::ROLE_APPLICATION :
+    case AccessibilityTypes::ROLE_APPLICATION:
       return ROLE_SYSTEM_APPLICATION;
-    case AccessibilityTypes::ROLE_BUTTONDROPDOWN :
+    case AccessibilityTypes::ROLE_BUTTONDROPDOWN:
       return ROLE_SYSTEM_BUTTONDROPDOWN;
-    case AccessibilityTypes::ROLE_GROUPING :
+    case AccessibilityTypes::ROLE_BUTTONMENU:
+      return ROLE_SYSTEM_BUTTONMENU;
+    case AccessibilityTypes::ROLE_GROUPING:
       return ROLE_SYSTEM_GROUPING;
-    case AccessibilityTypes::ROLE_PAGETAB :
+    case AccessibilityTypes::ROLE_PAGETAB:
       return ROLE_SYSTEM_PAGETAB;
-    case AccessibilityTypes::ROLE_PUSHBUTTON :
+    case AccessibilityTypes::ROLE_PAGETABLIST:
+      return ROLE_SYSTEM_PAGETABLIST;
+    case AccessibilityTypes::ROLE_PUSHBUTTON:
       return ROLE_SYSTEM_PUSHBUTTON;
-    case AccessibilityTypes::ROLE_TEXT :
+    case AccessibilityTypes::ROLE_SEPARATOR:
+      return ROLE_SYSTEM_SEPARATOR;
+    case AccessibilityTypes::ROLE_TEXT:
       return ROLE_SYSTEM_TEXT;
-    case AccessibilityTypes::ROLE_TOOLBAR :
+    case AccessibilityTypes::ROLE_TOOLBAR:
       return ROLE_SYSTEM_TOOLBAR;
-    case AccessibilityTypes::ROLE_CLIENT :
+    case AccessibilityTypes::ROLE_WINDOW:
+      return ROLE_SYSTEM_WINDOW;
+    case AccessibilityTypes::ROLE_CLIENT:
     default:
       // This is the default role for MSAA.
       return ROLE_SYSTEM_CLIENT;
   }
 }
 
 long ViewAccessibility::MSAAState(AccessibilityTypes::State state) {
   switch (state) {
     case AccessibilityTypes::STATE_HASPOPUP :
       return STATE_SYSTEM_HASPOPUP;
@@ skipping 47 matching lines @@
 
 STDMETHODIMP ViewAccessibility::put_accName(VARIANT var_id, BSTR put_name) {
   // Deprecated.
   return E_NOTIMPL;
 }
 
 STDMETHODIMP ViewAccessibility::put_accValue(VARIANT var_id, BSTR put_val) {
   // Deprecated.
   return E_NOTIMPL;
 }