Refactor all accessibility code out of webkit/glue.

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_
 #pragma once
 
 #include <map>
 #include <utility>
 #include <vector>
 
 #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__
 @class BrowserAccessibilityCocoa;
 #elif defined(OS_WIN)
 class BrowserAccessibilityWin;
 #elif defined(TOOLKIT_GTK)
 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;
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // BrowserAccessibility
 //
 // Class implementing the cross platform interface for the Browser-Renderer
 // communication of accessibility information, providing accessibility
 // to be used by screen readers and other assistive technology (AT).
 //
 // An implementation for each platform handles platform specific accessibility
@@ skipping 21 matching lines @@
   // Returns true if this is a native platform-specific object, vs a
   // cross-platform generic object.
   virtual bool IsNative() const;
 
   // Initialize this object, reading attributes from |src|. Does not
   // recurse into children of |src| and build the whole subtree.
   void PreInitialize(BrowserAccessibilityManager* manager,
       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);
 
   // Update the parent and index in parent if this node has been moved.
   void UpdateParent(BrowserAccessibility* parent, int index_in_parent);
 
   // Return true if this object is equal to or a descendant of |ancestor|.
   bool IsDescendantOf(BrowserAccessibility* ancestor);
 
@@ skipping 112 matching lines @@
 #if defined(OS_MACOSX) && __OBJC__
   BrowserAccessibilityCocoa* ToBrowserAccessibilityCocoa();
 #elif defined(OS_WIN)
   BrowserAccessibilityWin* ToBrowserAccessibilityWin();
 #elif defined(TOOLKIT_GTK)
   BrowserAccessibilityGtk* ToBrowserAccessibilityGtk();
 #endif
 
   // 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
   // returns true if found.
   bool GetHtmlAttribute(const char* attr, string16* 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(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;
 
   // Append the text from this node and its children.
   string16 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 47 matching lines @@
   // 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);
 };
 
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_H_