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

content/browser/accessibility/browser_accessibility.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_H_
 #define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_H_
 
 #include <map>
 #include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/strings/string16.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"
 
 #if defined(OS_MACOSX) && __OBJC__
 @class BrowserAccessibilityCocoa;
 #endif
 
 namespace content {
 class BrowserAccessibilityManager;
 #if defined(OS_WIN)
 class BrowserAccessibilityWin;
 #elif defined(TOOLKIT_GTK)
@@ skipping 35 matching lines @@
   virtual bool IsNative() const;
 
   // Initialize the tree structure of this object.
   void InitializeTreeStructure(
       BrowserAccessibilityManager* manager,
       BrowserAccessibility* parent,
       int32 renderer_id,
       int32 index_in_parent);
 
   // Initialize this object's data.
-  void InitializeData(const AccessibilityNodeData& src);
+  void InitializeData(const ui::AXNodeData& src);
 
   virtual void SwapChildren(std::vector<BrowserAccessibility*>& children);
 
   // Update the parent and index in parent if this node has been moved.
   void UpdateParent(BrowserAccessibility* parent, int index_in_parent);
 
   // Update this node's location, leaving everything else the same.
   virtual void SetLocation(const gfx::Rect& new_location);
 
   // Return true if this object is equal to or a descendant of |ancestor|.
@@ skipping 106 matching lines @@
   // by type (bool, int, float, string, int list).
   //
   // There are three accessors for each type of attribute: one that returns
   // true if the attribute is present and false if not, one that takes a
   // pointer argument and returns true if the attribute is present (if you
   // need to distinguish between the default value and a missing attribute),
   // and another that returns the default value for that type if the
   // attribute is not present. In addition, strings can be returned as
   // either std::string or base::string16, for convenience.
 
-  bool HasBoolAttribute(AccessibilityNodeData::BoolAttribute attr) const;
-  bool GetBoolAttribute(AccessibilityNodeData::BoolAttribute attr) const;
-  bool GetBoolAttribute(AccessibilityNodeData::BoolAttribute attr,
-                        bool* value) const;
+  bool HasBoolAttribute(ui::AXBoolAttribute attr) const;
+  bool GetBoolAttribute(ui::AXBoolAttribute attr) const;
+  bool GetBoolAttribute(ui::AXBoolAttribute attr, bool* value) const;
 
-  bool HasFloatAttribute(AccessibilityNodeData::FloatAttribute attr) const;
-  float GetFloatAttribute(AccessibilityNodeData::FloatAttribute attr) const;
-  bool GetFloatAttribute(AccessibilityNodeData::FloatAttribute attr,
-                         float* value) const;
+  bool HasFloatAttribute(ui::AXFloatAttribute attr) const;
+  float GetFloatAttribute(ui::AXFloatAttribute attr) const;
+  bool GetFloatAttribute(ui::AXFloatAttribute attr, float* value) const;
 
-  bool HasIntAttribute(AccessibilityNodeData::IntAttribute attribute) const;
-  int GetIntAttribute(AccessibilityNodeData::IntAttribute attribute) const;
-  bool GetIntAttribute(AccessibilityNodeData::IntAttribute attribute,
-                       int* value) const;
+  bool HasIntAttribute(ui::AXIntAttribute attribute) const;
+  int GetIntAttribute(ui::AXIntAttribute attribute) const;
+  bool GetIntAttribute(ui::AXIntAttribute attribute, int* value) const;
 
   bool HasStringAttribute(
-      AccessibilityNodeData::StringAttribute attribute) const;
-  const std::string& GetStringAttribute(
-      AccessibilityNodeData::StringAttribute attribute) const;
-  bool GetStringAttribute(AccessibilityNodeData::StringAttribute attribute,
+      ui::AXStringAttribute attribute) const;
+  const std::string& GetStringAttribute(ui::AXStringAttribute attribute) const;
+  bool GetStringAttribute(ui::AXStringAttribute attribute,
                           std::string* value) const;
 
-  bool GetString16Attribute(AccessibilityNodeData::StringAttribute attribute,
+  bool GetString16Attribute(ui::AXStringAttribute attribute,
                             base::string16* value) const;
   base::string16 GetString16Attribute(
-      AccessibilityNodeData::StringAttribute attribute) const;
+      ui::AXStringAttribute attribute) const;
 
-  bool HasIntListAttribute(
-      AccessibilityNodeData::IntListAttribute attribute) const;
+  bool HasIntListAttribute(ui::AXIntListAttribute attribute) const;
   const std::vector<int32>& GetIntListAttribute(
-      AccessibilityNodeData::IntListAttribute attribute) const;
-  bool GetIntListAttribute(AccessibilityNodeData::IntListAttribute attribute,
+      ui::AXIntListAttribute attribute) const;
+  bool GetIntListAttribute(ui::AXIntListAttribute attribute,
                            std::vector<int32>* value) const;
 
-  void SetStringAttribute(
-      AccessibilityNodeData::StringAttribute attribute,
-      const std::string& value);
+  void SetStringAttribute(ui::AXStringAttribute attribute,
+                          const std::string& value);
 
   // Retrieve the value of a html attribute from the attribute map and
   // returns true if found.
   bool GetHtmlAttribute(const char* attr, base::string16* value) const;
   bool GetHtmlAttribute(const char* attr, std::string* value) const;
 
   // Utility method to handle special cases for ARIA booleans, tristates and
   // booleans which have a "mixed" state.
   //
   // Warning: the term "Tristate" is used loosely by the spec and here,
   // as some attributes support a 4th state.
   //
   // The following attributes are appropriate to use with this method:
   // aria-selected  (selectable)
   // aria-grabbed   (grabbable)
   // aria-expanded  (expandable)
   // aria-pressed   (toggleable/pressable) -- supports 4th "mixed" state
   // aria-checked   (checkable) -- supports 4th "mixed state"
   bool GetAriaTristate(const char* attr_name,
                        bool* is_defined,
                        bool* is_mixed) const;
 
   // Returns true if the bit corresponding to the given state enum is 1.
-  bool HasState(blink::WebAXState state_enum) const;
+  bool HasState(ui::AXState state_enum) const;
 
   // Returns true if this node is an editable text field of any kind.
   bool IsEditableText() const;
 
   // Append the text from this node and its children.
   std::string GetTextRecursive() const;
 
  protected:
   // Perform platform specific initialization. This can be called multiple times
   // during the lifetime of this instance after the members of this base object
@@ skipping 21 matching lines @@
   // The ID of this object in the renderer process.
   int32 renderer_id_;
 
   // The children of this object.
   std::vector<BrowserAccessibility*> children_;
 
   // Accessibility metadata from the renderer
   std::string name_;
   std::string value_;
   std::vector<std::pair<
-      AccessibilityNodeData::BoolAttribute, bool> > bool_attributes_;
+      ui::AXBoolAttribute, bool> > bool_attributes_;
   std::vector<std::pair<
-      AccessibilityNodeData::FloatAttribute, float> > float_attributes_;
+      ui::AXFloatAttribute, float> > float_attributes_;
   std::vector<std::pair<
-      AccessibilityNodeData::IntAttribute, int> > int_attributes_;
+      ui::AXIntAttribute, int> > int_attributes_;
   std::vector<std::pair<
-      AccessibilityNodeData::StringAttribute, std::string> > string_attributes_;
+      ui::AXStringAttribute, std::string> > string_attributes_;
   std::vector<std::pair<
-      AccessibilityNodeData::IntListAttribute, std::vector<int32> > >
+      ui::AXIntListAttribute, std::vector<int32> > >
           intlist_attributes_;
   std::vector<std::pair<std::string, std::string> > html_attributes_;
   int32 role_;
   int32 state_;
   gfx::Rect location_;
 
   // BrowserAccessibility objects are reference-counted on some platforms.
   // When we're done with this object and it's removed from our accessibility
   // tree, a client may still be holding onto a pointer to this object, so
   // we mark it as inactive so that calls to any of this object's methods
   // immediately return failure.
   bool instance_active_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibility);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_H_