Refactor all accessibility code out of webkit/glue.

content/browser/accessibility/browser_accessibility_gtk.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_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "base/utf_string_conversions.h"
 #include "content/browser/accessibility/browser_accessibility_manager_gtk.h"
 #include "content/common/accessibility_messages.h"
 
-using webkit_glue::WebAccessibility;
+using content::AccessibilityNodeData;
 
 // The maximum length of an autogenerated unique type name string,
 // generated from the 16-bit interface mask from an AtkObject.
 // 30 is enough for the prefix "WAIType" + 5 hex chars (max) */
 static const int kWAITypeNameLen = 30;
 
 static gpointer browser_accessibility_parent_class = NULL;
 
 static BrowserAccessibilityGtk* ToBrowserAccessibilityGtk(
     BrowserAccessibilityAtk* atk_object) {
@@ skipping 59 matching lines @@
   return obj->atk_role();
 }
 
 static AtkStateSet* browser_accessibility_ref_state_set(AtkObject* atk_object) {
   BrowserAccessibilityGtk* obj = ToBrowserAccessibilityGtk(atk_object);
   AtkStateSet* state_set =
       ATK_OBJECT_CLASS(browser_accessibility_parent_class)->
           ref_state_set(atk_object);
   int32 state = obj->state();
 
-  if ((state >> WebAccessibility::STATE_FOCUSABLE) & 1)
+  if ((state >> AccessibilityNodeData::STATE_FOCUSABLE) & 1)
     atk_state_set_add_state(state_set, ATK_STATE_FOCUSABLE);
   if (obj->manager()->GetFocus(NULL) == obj)
     atk_state_set_add_state(state_set, ATK_STATE_FOCUSED);
 
   return state_set;
 }
 
 static AtkRelationSet* browser_accessibility_ref_relation_set(
     AtkObject* atk_object) {
   AtkRelationSet* relation_set =
@@ skipping 203 matching lines @@
 }
 
 bool BrowserAccessibilityGtk::IsNative() const {
   return true;
 }
 
 void BrowserAccessibilityGtk::InitRoleAndState() {
   atk_acc_name_ = UTF16ToUTF8(name());
 
   string16 description;
-  GetStringAttribute(WebAccessibility::ATTR_DESCRIPTION, &description);
+  GetStringAttribute(AccessibilityNodeData::ATTR_DESCRIPTION, &description);
   atk_acc_description_ = UTF16ToUTF8(description);
 
   switch(role_) {
-    case WebAccessibility::ROLE_BUTTON:
+    case AccessibilityNodeData::ROLE_BUTTON:
       atk_role_ = ATK_ROLE_PUSH_BUTTON;
       break;
-    case WebAccessibility::ROLE_CHECKBOX:
+    case AccessibilityNodeData::ROLE_CHECKBOX:
       atk_role_ = ATK_ROLE_CHECK_BOX;
       break;
-    case WebAccessibility::ROLE_COMBO_BOX:
+    case AccessibilityNodeData::ROLE_COMBO_BOX:
       atk_role_ = ATK_ROLE_COMBO_BOX;
       break;
-    case WebAccessibility::ROLE_LINK:
+    case AccessibilityNodeData::ROLE_LINK:
       atk_role_ = ATK_ROLE_LINK;
       break;
-    case WebAccessibility::ROLE_RADIO_BUTTON:
+    case AccessibilityNodeData::ROLE_RADIO_BUTTON:
       atk_role_ = ATK_ROLE_RADIO_BUTTON;
       break;
-    case WebAccessibility::ROLE_TEXTAREA:
+    case AccessibilityNodeData::ROLE_TEXTAREA:
       atk_role_ = ATK_ROLE_ENTRY;
       break;
-    case WebAccessibility::ROLE_TEXT_FIELD:
+    case AccessibilityNodeData::ROLE_TEXT_FIELD:
       atk_role_ = ATK_ROLE_ENTRY;
       break;
-    case WebAccessibility::ROLE_WEBCORE_LINK:
+    case AccessibilityNodeData::ROLE_WEBCORE_LINK:
       atk_role_ = ATK_ROLE_LINK;
       break;
     default:
       atk_role_ = ATK_ROLE_UNKNOWN;
       break;
   }
 }