Move AX Role predicates into ax_role_properties.h.

content/browser/accessibility/browser_accessibility_manager_mac.mm

 // 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_manager_mac.h"
 
 #include "base/bind.h"
+#include "base/location.h"
+#include "base/logging.h"
 #import "base/mac/mac_util.h"
 #import "base/mac/scoped_nsobject.h"
 #import "base/mac/sdk_forward_declarations.h"
-#include "base/location.h"
-#include "base/logging.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #import "content/browser/accessibility/browser_accessibility_cocoa.h"
 #import "content/browser/accessibility/browser_accessibility_mac.h"
 #include "content/common/accessibility_messages.h"
 #include "content/public/browser/browser_thread.h"
+#include "ui/accessibility/ax_role_properties.h"
 
 namespace {
 
 // Use same value as in Safari's WebKit.
 const int kLiveRegionChangeIntervalMS = 20;
 
 // Declare undocumented accessibility constants and enums only present in
 // WebKit.
 
 enum AXTextStateChangeType {
@@ skipping 173 matching lines @@
       if (IsRootTree()) {
         mac_notification = NSAccessibilityLoadCompleteNotification;
       } else {
         mac_notification = NSAccessibilityLayoutCompleteNotification;
       }
       break;
     case ui::AX_EVENT_INVALID_STATUS_CHANGED:
       mac_notification = NSAccessibilityInvalidStatusChangedNotification;
       break;
     case ui::AX_EVENT_SELECTED_CHILDREN_CHANGED:
-      if (node->IsTableLikeRole()) {
+      if (ui::IsTableLikeRole(node->GetRole())) {
         mac_notification = NSAccessibilitySelectedRowsChangedNotification;
       } else {
         mac_notification = NSAccessibilitySelectedChildrenChangedNotification;
       }
       break;
     case ui::AX_EVENT_DOCUMENT_SELECTION_CHANGED: {
       mac_notification = NSAccessibilitySelectedTextChangedNotification;
       // WebKit fires a notification both on the focused object and the root.
       BrowserAccessibility* focus = GetFocus();
       if (!focus)
@@ skipping 200 matching lines @@
     while (i < old_text.length() && i < new_text.length() &&
            old_text[i] == new_text[i]) {
       ++i;
     }
     size_t length = (old_text.length() - i) - (new_text.length() - i);
     base::string16 deleted_text = old_text.substr(i, length);
     text_edits_[new_node_data.id] = deleted_text;
   }
 }
 
-bool IsContainerWithSelectableChildrenRole(ui::AXRole role) {
-  switch (role) {
-    case ui::AX_ROLE_COMBO_BOX:
-    case ui::AX_ROLE_GRID:
-    case ui::AX_ROLE_LIST_BOX:
-    case ui::AX_ROLE_MENU:
-    case ui::AX_ROLE_MENU_BAR:
-    case ui::AX_ROLE_RADIO_GROUP:
-    case ui::AX_ROLE_TAB_LIST:
-    case ui::AX_ROLE_TOOLBAR:
-    case ui::AX_ROLE_TREE:
-    case ui::AX_ROLE_TREE_GRID:
-      return true;
-    default:
-      return false;
-  }
-}
-
-bool IsRowContainer(ui::AXRole role) {
-  switch (role) {
-    case ui::AX_ROLE_TREE:
-    case ui::AX_ROLE_TREE_GRID:
-    case ui::AX_ROLE_GRID:
-    case ui::AX_ROLE_TABLE:
-      return true;
-    default:
-      return false;
-  }
-}
-
 void BrowserAccessibilityManagerMac::OnStateChanged(ui::AXTree* tree,
                                                     ui::AXNode* node,
                                                     ui::AXState state,
                                                     bool new_value) {
   BrowserAccessibilityManager::OnStateChanged(tree, node, state, new_value);
   if (state == ui::AX_STATE_EXPANDED) {
     if (node->data().role == ui::AX_ROLE_ROW ||
         node->data().role == ui::AX_ROLE_TREE_ITEM) {
       if (new_value)
         tree_events_[node->id()].insert(ui::AX_EVENT_ROW_EXPANDED);
       else
         tree_events_[node->id()].insert(ui::AX_EVENT_ROW_COLLAPSED);
       ui::AXNode* container = node;
-      while (container && !IsRowContainer(container->data().role))
+      while (container && !ui::IsRowContainer(container->data().role))
         container = container->parent();
       if (container)
         tree_events_[container->id()].insert(ui::AX_EVENT_ROW_COUNT_CHANGED);
     } else {
       tree_events_[node->id()].insert(ui::AX_EVENT_EXPANDED_CHANGED);
     }
   }
   if (state == ui::AX_STATE_SELECTED) {
     ui::AXNode* container = node;
     while (container &&
-           !IsContainerWithSelectableChildrenRole(container->data().role))
+           !ui::IsContainerWithSelectableChildrenRole(container->data().role))
       container = container->parent();
     if (container)
       tree_events_[container->id()].insert(
           ui::AX_EVENT_SELECTED_CHILDREN_CHANGED);
   }
 }
 
 void BrowserAccessibilityManagerMac::OnStringAttributeChanged(
     ui::AXTree* tree,
     ui::AXNode* node,
@@ skipping 143 matching lines @@
     NSAccessibilityTextChangeValues : changes,
     NSAccessibilityTextChangeElement : native_node
   };
 }
 
 NSView* BrowserAccessibilityManagerMac::GetParentView() {
   return delegate() ? delegate()->AccessibilityGetAcceleratedWidget() : nullptr;
 }
 
 }  // namespace content