First step to move common accessibility code out of content.

content/public/common/ax_node_data.h

Index: content/public/common/ax_node_data.h
diff --git a/content/common/accessibility_node_data.h b/content/public/common/ax_node_data.h
similarity index 79%
copy from content/common/accessibility_node_data.h
copy to content/public/common/ax_node_data.h
index c0c07662b20dc952f9fb0ea15786636e50a5ec1c..2c40df7260ed43db052e532f6a5c0bd7c74c5c3e 100644
--- a/content/common/accessibility_node_data.h
+++ b/content/public/common/ax_node_data.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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_COMMON_ACCESSIBILITY_NODE_DATA_H_
-#define CONTENT_COMMON_ACCESSIBILITY_NODE_DATA_H_
+#ifndef CONTENT_PUBLIC_COMMON_AX_NODE_DATA_H_
+#define CONTENT_PUBLIC_COMMON_AX_NODE_DATA_H_
 
 #include <map>
 #include <string>
@@ -19,7 +19,7 @@ namespace content {
 // A compact representation of the accessibility information for a
 // single web object, in a form that can be serialized and sent from
 // the renderer process to the browser process.

[David Tseng, 2013/11/11 18:43:51]

"from a source process to a receiver process" (since the extension process is
technically a renderer, we will be sending browser process -> renderer process).

[dmazzoni, 2013/11/12 00:03:04]

Done.

-struct CONTENT_EXPORT AccessibilityNodeData {
+struct CONTENT_EXPORT AXNodeData {
   // Additional optional attributes that can be optionally attached to
   // a node.
   enum StringAttribute {
@@ -164,8 +164,8 @@ struct CONTENT_EXPORT AccessibilityNodeData {
     ATTR_WORD_ENDS,
   };
 
-  AccessibilityNodeData();
-  virtual ~AccessibilityNodeData();
+  AXNodeData();
+  virtual ~AXNodeData();
 
   void AddStringAttribute(StringAttribute attribute,
                           const std::string& value);
@@ -181,10 +181,6 @@ struct CONTENT_EXPORT AccessibilityNodeData {
   // Equivalent to AddStringAttribute(ATTR_VALUE, value).
   void SetValue(std::string value);
 
-  #ifndef NDEBUG
-  virtual std::string DebugString(bool recursive) const;
-  #endif
-
   // This is a simple serializable struct. All member variables should be
   // public and copyable.
   int32 id;
@@ -201,33 +197,6 @@ struct CONTENT_EXPORT AccessibilityNodeData {
   std::vector<int32> child_ids;
 };
 
-// For testing and debugging only: this subclass of AccessibilityNodeData
-// is used to represent a whole tree of accessibility nodes, where each
-// node owns its children. This makes it easy to print the tree structure
-// or search it recursively.
-struct CONTENT_EXPORT AccessibilityNodeDataTreeNode
-    : public AccessibilityNodeData {
-  AccessibilityNodeDataTreeNode();
-  virtual ~AccessibilityNodeDataTreeNode();
-
-  AccessibilityNodeDataTreeNode& operator=(const AccessibilityNodeData& src);
-
-  #ifndef NDEBUG
-  virtual std::string DebugString(bool recursive) const OVERRIDE;
-  #endif
-
-  std::vector<AccessibilityNodeDataTreeNode> children;
-};
-
-// Given a vector of accessibility nodes that represent a complete
-// accessibility tree, where each node appears before its children,
-// build a tree of AccessibilityNodeDataTreeNode objects for easier
-// testing and debugging, where each node contains its children.
-// The |dst| argument will become the root of the new tree.
-void MakeAccessibilityNodeDataTree(
-    const std::vector<AccessibilityNodeData>& src,
-    AccessibilityNodeDataTreeNode* dst);
-
 }  // namespace content
 
-#endif  // CONTENT_COMMON_ACCESSIBILITY_NODE_DATA_H_
+#endif  // CONTENT_PUBLIC_COMMON_AX_NODE_DATA_H_