Refactor all accessibility code out of webkit/glue.

content/browser/accessibility/browser_accessibility.h

Index: content/browser/accessibility/browser_accessibility.h
diff --git a/content/browser/accessibility/browser_accessibility.h b/content/browser/accessibility/browser_accessibility.h
index 0589410fd831c8ed07aeb2626f23563cba7dcfbb..3f03b6a65bf5f70ae13d5024185e423c77c57f7c 100644
--- a/content/browser/accessibility/browser_accessibility.h
+++ b/content/browser/accessibility/browser_accessibility.h
@@ -12,8 +12,8 @@
 
 #include "base/basictypes.h"
 #include "build/build_config.h"
+#include "content/common/accessibility_node_data.h"
 #include "content/common/content_export.h"
-#include "webkit/glue/webaccessibility.h"
 
 class BrowserAccessibilityManager;
 #if defined(OS_MACOSX) && __OBJC__
@@ -24,11 +24,12 @@ class BrowserAccessibilityWin;
 class BrowserAccessibilityGtk;
 #endif
 
-using webkit_glue::WebAccessibility;
-typedef std::map<WebAccessibility::BoolAttribute, bool> BoolAttrMap;
-typedef std::map<WebAccessibility::FloatAttribute, float> FloatAttrMap;
-typedef std::map<WebAccessibility::IntAttribute, int> IntAttrMap;
-typedef std::map<WebAccessibility::StringAttribute, string16> StringAttrMap;
+using content::AccessibilityNodeData;

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

this is against the google style guide per
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml?showone=Namesp...

[dmazzoni, 2012/06/12 18:35:33]

Done throughout, got rid of "using" in header files.

+typedef std::map<AccessibilityNodeData::BoolAttribute, bool> BoolAttrMap;
+typedef std::map<AccessibilityNodeData::FloatAttribute, float> FloatAttrMap;
+typedef std::map<AccessibilityNodeData::IntAttribute, int> IntAttrMap;
+typedef std::map<AccessibilityNodeData::StringAttribute, string16>
+    StringAttrMap;
 
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -70,7 +71,7 @@ class CONTENT_EXPORT BrowserAccessibility {
       BrowserAccessibility* parent,
       int32 child_id,
       int32 index_in_parent,
-      const WebAccessibility& src);
+      const AccessibilityNodeData& src);
 
   // Add a child of this object.
   void AddChild(BrowserAccessibility* child);
@@ -203,22 +204,22 @@ class CONTENT_EXPORT BrowserAccessibility {
 
   // Retrieve the value of a bool attribute from the bool attribute
   // map and returns true if found.
-  bool GetBoolAttribute(WebAccessibility::BoolAttribute attr, bool* value)
+  bool GetBoolAttribute(AccessibilityNodeData::BoolAttribute attr, bool* value)
       const;
 
   // Retrieve the value of a float attribute from the float attribute
   // map and returns true if found.
-  bool GetFloatAttribute(WebAccessibility::FloatAttribute attr, float* value)
-      const;
+  bool GetFloatAttribute(AccessibilityNodeData::FloatAttribute attr,
+                         float* value) const;
 
   // Retrieve the value of an integer attribute from the integer attribute
   // map and returns true if found.
-  bool GetIntAttribute(WebAccessibility::IntAttribute attribute, int* value)
-      const;
+  bool GetIntAttribute(AccessibilityNodeData::IntAttribute attribute,
+                       int* value) const;
 
   // Retrieve the value of a string attribute from the attribute map and
   // returns true if found.
-  bool GetStringAttribute(WebAccessibility::StringAttribute attribute,
+  bool GetStringAttribute(AccessibilityNodeData::StringAttribute attribute,
                           string16* value) const;
 
   // Retrieve the value of a html attribute from the attribute map and
@@ -242,7 +243,7 @@ class CONTENT_EXPORT BrowserAccessibility {
                        bool* is_mixed) const;
 
   // Returns true if the bit corresponding to the given state enum is 1.
-  bool HasState(WebAccessibility::State state_enum) const;
+  bool HasState(AccessibilityNodeData::State state_enum) const;
 
   // Returns true if this node is an editable text field of any kind.
   bool IsEditableText() const;