Refactor content/ to use ui::AXNodeData instead of blink.

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_
 
 #include <vector>
 
 #include "base/containers/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 "third_party/WebKit/public/web/WebAXEnums.h"
+#include "ui/accessibility/ax_node_data.h"
 #include "ui/gfx/native_widget_types.h"
 
 struct AccessibilityHostMsg_EventParams;
 struct AccessibilityHostMsg_LocationChangeParams;
 
 namespace content {
 class BrowserAccessibility;
 #if defined(OS_ANDROID)
 class BrowserAccessibilityManagerAndroid;
 #endif
@@ skipping 27 matching lines @@
   // reference to it.
   virtual BrowserAccessibility* Create();
 };
 
 // Manages a tree of BrowserAccessibility objects.
 class CONTENT_EXPORT BrowserAccessibilityManager {
  public:
   // Creates the platform-specific BrowserAccessibilityManager, but
   // with no parent window pointer. Only useful for unit tests.
   static BrowserAccessibilityManager* Create(
-      const AccessibilityNodeData& src,
+      const ui::AXNodeData& src,
       BrowserAccessibilityDelegate* delegate,
       BrowserAccessibilityFactory* factory = new BrowserAccessibilityFactory());
 
   virtual ~BrowserAccessibilityManager();
 
-  void Initialize(const AccessibilityNodeData src);
+  void Initialize(const ui::AXNodeData src);
 
-  static AccessibilityNodeData GetEmptyDocument();
+  static ui::AXNodeData GetEmptyDocument();
 
   virtual void NotifyAccessibilityEvent(
-      blink::WebAXEvent event_type, BrowserAccessibility* node) { }
+      ui::AXEvent event_type, BrowserAccessibility* node) { }
 
   // Return a pointer to the root of the tree, does not make a new reference.
   BrowserAccessibility* GetRoot();
 
   // Removes a node from the manager.
   virtual void RemoveNode(BrowserAccessibility* node);
 
   // Return a pointer to the object corresponding to the given renderer_id,
   // does not make a new reference.
   BrowserAccessibility* GetFromRendererID(int32 renderer_id);
@@ skipping 67 matching lines @@
 
   // True by default, but some platforms want to treat the root
   // scroll offsets separately.
   virtual bool UseRootScrollOffsetsWhenComputingBounds();
 
   // For testing only: update the given nodes as if they were
   // received from the renderer process in OnAccessibilityEvents.
   // Takes up to 7 nodes at once so tests don't need to create a vector
   // each time.
   void UpdateNodesForTesting(
-      const AccessibilityNodeData& node,
-      const AccessibilityNodeData& node2 = AccessibilityNodeData(),
-      const AccessibilityNodeData& node3 = AccessibilityNodeData(),
-      const AccessibilityNodeData& node4 = AccessibilityNodeData(),
-      const AccessibilityNodeData& node5 = AccessibilityNodeData(),
-      const AccessibilityNodeData& node6 = AccessibilityNodeData(),
-      const AccessibilityNodeData& node7 = AccessibilityNodeData());
+      const ui::AXNodeData& node,
+      const ui::AXNodeData& node2 = ui::AXNodeData(),
+      const ui::AXNodeData& node3 = ui::AXNodeData(),
+      const ui::AXNodeData& node4 = ui::AXNodeData(),
+      const ui::AXNodeData& node5 = ui::AXNodeData(),
+      const ui::AXNodeData& node6 = ui::AXNodeData(),
+      const ui::AXNodeData& node7 = ui::AXNodeData());
 
  protected:
   BrowserAccessibilityManager(
       BrowserAccessibilityDelegate* delegate,
       BrowserAccessibilityFactory* factory);
 
   BrowserAccessibilityManager(
-      const AccessibilityNodeData& src,
+      const ui::AXNodeData& src,
       BrowserAccessibilityDelegate* delegate,
       BrowserAccessibilityFactory* factory);
 
   virtual void AddNodeToMap(BrowserAccessibility* node);
 
   virtual void NotifyRootChanged() {}
 
  private:
   // The following states keep track of whether or not the
   // on-screen keyboard is allowed to be shown.
@@ skipping 12 matching lines @@
     OSK_ALLOWED_WITHIN_FOCUSED_OBJECT,
 
     // Focus has changed within a tab that's already visible. Allow the
     // on-screen keyboard to show anytime that a touch event leads to an
     // editable text control getting focus.
     OSK_ALLOWED
   };
 
   // Update a set of nodes using data received from the renderer
   // process.
-  bool UpdateNodes(const std::vector<AccessibilityNodeData>& nodes);
+  bool UpdateNodes(const std::vector<ui::AXNodeData>& nodes);
 
   // Update one node from the tree using data received from the renderer
   // process. Returns true on success, false on fatal error.
-  bool UpdateNode(const AccessibilityNodeData& src);
+  bool UpdateNode(const ui::AXNodeData& src);
 
   void SetRoot(BrowserAccessibility* root);
 
   BrowserAccessibility* CreateNode(
       BrowserAccessibility* parent,
       int32 renderer_id,
       int32 index_in_parent);
 
  protected:
   // The object that can perform actions on our behalf.
@@ skipping 12 matching lines @@
 
   // A mapping from renderer IDs to BrowserAccessibility objects.
   base::hash_map<int32, BrowserAccessibility*> renderer_id_map_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_H_