Refactor all accessibility code out of webkit/glue.

content/browser/accessibility/browser_accessibility_manager.h

 // 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.
 
 #ifndef CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_H_
 #define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_H_
 #pragma once
 
 #include <vector>
 
 #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;
 
 // Class that can perform actions on behalf of the BrowserAccessibilityManager.
 class CONTENT_EXPORT BrowserAccessibilityDelegate {
  public:
   virtual ~BrowserAccessibilityDelegate() {}
   virtual void SetAccessibilityFocus(int acc_obj_id) = 0;
   virtual void AccessibilityDoDefaultAction(int acc_obj_id) = 0;
   virtual void AccessibilityScrollToMakeVisible(
@@ skipping 15 matching lines @@
   virtual BrowserAccessibility* Create();
 };
 
 // Manages a tree of BrowserAccessibility objects.
 class CONTENT_EXPORT BrowserAccessibilityManager {
  public:
   // Creates the platform specific BrowserAccessibilityManager. Ownership passes
   // to the caller.
   static BrowserAccessibilityManager* Create(
     gfx::NativeView parent_view,
-    const WebAccessibility& src,
+    const AccessibilityNodeData& src,
     BrowserAccessibilityDelegate* delegate,
     BrowserAccessibilityFactory* factory = new BrowserAccessibilityFactory());
 
   // Creates the platform specific BrowserAccessibilityManager. Ownership passes
   // to the caller.
   static BrowserAccessibilityManager* CreateEmptyDocument(
     gfx::NativeView parent_view,
-    WebAccessibility::State state,
+    AccessibilityNodeData::State state,
     BrowserAccessibilityDelegate* delegate,
     BrowserAccessibilityFactory* factory = new BrowserAccessibilityFactory());
 
   virtual ~BrowserAccessibilityManager();
 
   // Type is enum AccessibilityNotification.
   // We pass it as int so that we don't include the message declaration
   // header here.
   virtual void NotifyAccessibilityEvent(
       int type,
@@ skipping 58 matching lines @@
   BrowserAccessibilityManagerWin* ToBrowserAccessibilityManagerWin();
 #endif
 
   // Return the object that has focus, if it's a descandant of the
   // given root (inclusive). Does not make a new reference.
   BrowserAccessibility* GetFocus(BrowserAccessibility* root);
 
  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);
 
  protected:
   // The next unique id for a BrowserAccessibility instance.
   static int32 next_child_id_;
 
   // The parent view.
   gfx::NativeView parent_view_;
 
@@ skipping 12 matching lines @@
   // we use internally here.
   base::hash_map<int32, int32> renderer_id_to_child_id_map_;
 
   // A mapping from child IDs to BrowserAccessibility objects.
   base::hash_map<int32, BrowserAccessibility*> child_id_map_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityManager);
 };
 
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_H_