Use Blink accessibility enums in Chromium

content/browser/accessibility/browser_accessibility.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.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 124 matching lines @@
 }
 
 gfx::Rect BrowserAccessibility::GetLocalBoundsRect() const {
   gfx::Rect bounds = location_;
 
   // Walk up the parent chain. Every time we encounter a Web Area, offset
   // based on the scroll bars and then offset based on the origin of that
   // nested web area.
   BrowserAccessibility* parent = parent_;
   bool need_to_offset_web_area =
-      (role_ == AccessibilityNodeData::ROLE_WEB_AREA ||
-       role_ == AccessibilityNodeData::ROLE_ROOT_WEB_AREA);
+      (role_ == WebKit::WebAXRoleWebArea ||
+       role_ == WebKit::WebAXRoleRootWebArea);
   while (parent) {
     if (need_to_offset_web_area &&
         parent->location().width() > 0 &&
         parent->location().height() > 0) {
       bounds.Offset(parent->location().x(), parent->location().y());
       need_to_offset_web_area = false;
     }
 
     // On some platforms, we don't want to take the root scroll offsets
     // into account.
-    if (parent->role() == AccessibilityNodeData::ROLE_ROOT_WEB_AREA &&
+    if (parent->role() == WebKit::WebAXRoleRootWebArea &&
         !manager()->UseRootScrollOffsetsWhenComputingBounds()) {
       break;
     }
 
-    if (parent->role() == AccessibilityNodeData::ROLE_WEB_AREA ||
-        parent->role() == AccessibilityNodeData::ROLE_ROOT_WEB_AREA) {
+    if (parent->role() == WebKit::WebAXRoleWebArea ||
+        parent->role() == WebKit::WebAXRoleRootWebArea) {
       int sx = 0;
       int sy = 0;
       if (parent->GetIntAttribute(AccessibilityNodeData::ATTR_SCROLL_X, &sx) &&
           parent->GetIntAttribute(AccessibilityNodeData::ATTR_SCROLL_Y, &sy)) {
         bounds.Offset(-sx, -sy);
       }
       need_to_offset_web_area = true;
     }
     parent = parent->parent();
   }
@@ skipping 30 matching lines @@
     (*iter)->Destroy();
   }
   children_.clear();
 
   // Allow the object to fire a TextRemoved notification.
   name_.clear();
   value_.clear();
   PostInitialize();
 
   manager_->NotifyAccessibilityEvent(
-      AccessibilityNotificationObjectHide, this);
+      WebKit::WebAXEventHide, this);
 
   instance_active_ = false;
   manager_->RemoveNode(this);
   NativeReleaseReference();
 }
 
 void BrowserAccessibility::NativeReleaseReference() {
   delete this;
 }
 
@@ skipping 224 matching lines @@
 
   if (EqualsASCII(value, "true"))
     return true;
 
   if (EqualsASCII(value, "mixed"))
     *is_mixed = true;
 
   return false;  // Not set
 }
 
-bool BrowserAccessibility::HasState(
-    AccessibilityNodeData::State state_enum) const {
+bool BrowserAccessibility::HasState(WebKit::WebAXState state_enum) const {
   return (state_ >> state_enum) & 1;
 }
 
 bool BrowserAccessibility::IsEditableText() const {
   // These roles don't have readonly set, but they're not editable text.
-  if (role_ == AccessibilityNodeData::ROLE_SCROLLAREA ||
-      role_ == AccessibilityNodeData::ROLE_COLUMN ||
-      role_ == AccessibilityNodeData::ROLE_TABLE_HEADER_CONTAINER) {
+  if (role_ == WebKit::WebAXRoleScrollArea ||
+      role_ == WebKit::WebAXRoleColumn ||
+      role_ == WebKit::WebAXRoleTableHeaderContainer) {
     return false;
   }
 
-  // Note: STATE_READONLY being false means it's either a text control,
+  // Note: WebAXStateReadonly being false means it's either a text control,
   // or contenteditable. We also check for editable text roles to cover
   // another element that has role=textbox set on it.
-  return (!HasState(AccessibilityNodeData::STATE_READONLY) ||
-          role_ == AccessibilityNodeData::ROLE_TEXT_FIELD ||
-          role_ == AccessibilityNodeData::ROLE_TEXTAREA);
+  return (!HasState(WebKit::WebAXStateReadonly) ||
+          role_ == WebKit::WebAXRoleTextField ||
+          role_ == WebKit::WebAXRoleTextArea);
 }
 
 std::string BrowserAccessibility::GetTextRecursive() const {
   if (!name_.empty()) {
     return name_;
   }
 
   std::string result;
   for (size_t i = 0; i < children_.size(); ++i)
     result += children_[i]->GetTextRecursive();
   return result;
 }
 
 }  // namespace content