Refactor all accessibility code out of webkit/glue.

content/browser/accessibility/browser_accessibility_manager.h

Index: content/browser/accessibility/browser_accessibility_manager.h
diff --git a/content/browser/accessibility/browser_accessibility_manager.h b/content/browser/accessibility/browser_accessibility_manager.h
index 7e1757b7c34cb38d6d5471ab1a7b473ad1361d24..6e5f856d65ec34facf2988c92896f14f46ef01d1 100644
--- a/content/browser/accessibility/browser_accessibility_manager.h
+++ b/content/browser/accessibility/browser_accessibility_manager.h
@@ -11,16 +11,16 @@
 #include "base/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "build/build_config.h"
+#include "content/common/accessibility_node_data.h"
 #include "content/common/content_export.h"
 #include "ui/gfx/native_widget_types.h"
-#include "webkit/glue/webaccessibility.h"
 
 class BrowserAccessibility;
 #if defined(OS_WIN)
 class BrowserAccessibilityManagerWin;
 #endif
 
-using webkit_glue::WebAccessibility;
+using content::AccessibilityNodeData;

[jam, 2012/06/12 00:00:42]

ditto

 
 struct AccessibilityHostMsg_NotificationParams;
 
@@ -56,7 +56,7 @@ class CONTENT_EXPORT BrowserAccessibilityManager {
   // to the caller.
   static BrowserAccessibilityManager* Create(
     gfx::NativeView parent_view,
-    const WebAccessibility& src,
+    const AccessibilityNodeData& src,
     BrowserAccessibilityDelegate* delegate,
     BrowserAccessibilityFactory* factory = new BrowserAccessibilityFactory());
 
@@ -64,7 +64,7 @@ class CONTENT_EXPORT BrowserAccessibilityManager {
   // to the caller.
   static BrowserAccessibilityManager* CreateEmptyDocument(
     gfx::NativeView parent_view,
-    WebAccessibility::State state,
+    AccessibilityNodeData::State state,
     BrowserAccessibilityDelegate* delegate,
     BrowserAccessibilityFactory* factory = new BrowserAccessibilityFactory());
 
@@ -143,22 +143,22 @@ class CONTENT_EXPORT BrowserAccessibilityManager {
  protected:
   BrowserAccessibilityManager(
       gfx::NativeView parent_view,
-      const WebAccessibility& src,
+      const AccessibilityNodeData& src,
       BrowserAccessibilityDelegate* delegate,
       BrowserAccessibilityFactory* factory);
 
  private:
-  // Update an accessibility node with an updated WebAccessibility node
+  // Update an accessibility node with an updated AccessibilityNodeData node
   // received from the renderer process. When |include_children| is true
   // the node's children will also be updated, otherwise only the node
   // itself is updated.
-  void UpdateNode(const WebAccessibility& src, bool include_children);
+  void UpdateNode(const AccessibilityNodeData& src, bool include_children);
 
   // Recursively build a tree of BrowserAccessibility objects from
-  // the WebAccessibility tree received from the renderer process.
+  // the AccessibilityNodeData tree received from the renderer process.
   BrowserAccessibility* CreateAccessibilityTree(
       BrowserAccessibility* parent,
-      const WebAccessibility& src,
+      const AccessibilityNodeData& src,
       int index_in_parent,
       bool send_show_events);