Revert of Create AXAction and AXActionData as a way to simplify accessibility actions

content/common/accessibility_messages.h

Index: content/common/accessibility_messages.h
diff --git a/content/common/accessibility_messages.h b/content/common/accessibility_messages.h
index 261efd4c0d24e7601d0f39571373b31a7d3286cd..abb97a739d7c4cbc77dd5e789085a8d53fb42763 100644
--- a/content/common/accessibility_messages.h
+++ b/content/common/accessibility_messages.h
@@ -13,7 +13,6 @@
 #include "ipc/ipc_param_traits.h"
 #include "ipc/param_traits_macros.h"
 #include "third_party/WebKit/public/web/WebAXEnums.h"
-#include "ui/accessibility/ax_action_data.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/accessibility/ax_relative_bounds.h"
 #include "ui/accessibility/ax_tree_update.h"
@@ -26,20 +25,6 @@
 
 IPC_ENUM_TRAITS_MAX_VALUE(content::AXContentIntAttribute,
                           content::AX_CONTENT_INT_ATTRIBUTE_LAST)
-IPC_ENUM_TRAITS_MAX_VALUE(ui::AXAction, ui::AX_ACTION_LAST)
-
-IPC_STRUCT_TRAITS_BEGIN(ui::AXActionData)
-  IPC_STRUCT_TRAITS_MEMBER(action)
-  IPC_STRUCT_TRAITS_MEMBER(target_node_id)
-  IPC_STRUCT_TRAITS_MEMBER(flags)
-  IPC_STRUCT_TRAITS_MEMBER(anchor_node_id)
-  IPC_STRUCT_TRAITS_MEMBER(anchor_offset)
-  IPC_STRUCT_TRAITS_MEMBER(focus_node_id)
-  IPC_STRUCT_TRAITS_MEMBER(focus_offset)
-  IPC_STRUCT_TRAITS_MEMBER(target_rect)
-  IPC_STRUCT_TRAITS_MEMBER(target_point)
-  IPC_STRUCT_TRAITS_MEMBER(value)
-IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(content::AXContentNodeData)
   IPC_STRUCT_TRAITS_MEMBER(id)
@@ -131,10 +116,55 @@
 
 // Messages sent from the browser to the renderer.
 
-// Relay a request from assistive technology to perform an action,
-// such as focusing or clicking on a node.
-IPC_MESSAGE_ROUTED1(AccessibilityMsg_PerformAction,
-                    ui::AXActionData  /* action parameters */)
+// Relay a request from assistive technology to set focus to a given node.
+IPC_MESSAGE_ROUTED1(AccessibilityMsg_SetFocus,
+                    int /* object id */)
+
+// Relay a request from assistive technology to perform the default action
+// on a given node.
+IPC_MESSAGE_ROUTED1(AccessibilityMsg_DoDefaultAction,
+                    int /* object id */)
+
+// Relay a request from assistive technology to make a given object
+// visible by scrolling as many scrollable containers as possible.
+// In addition, if it's not possible to make the entire object visible,
+// scroll so that the |subfocus| rect is visible at least. The subfocus
+// rect is in local coordinates of the object itself.
+IPC_MESSAGE_ROUTED2(AccessibilityMsg_ScrollToMakeVisible,
+                    int /* object id */,
+                    gfx::Rect /* subfocus */)
+
+// Relay a request from assistive technology to show the context menu for a
+// given object.
+IPC_MESSAGE_ROUTED1(AccessibilityMsg_ShowContextMenu, int /* object id */)
+
+// Relay a request from assistive technology to move a given object
+// to a specific location, in the WebContents area coordinate space, i.e.
+// (0, 0) is the top-left corner of the WebContents.
+IPC_MESSAGE_ROUTED2(AccessibilityMsg_ScrollToPoint,
+                    int /* object id */,
+                    gfx::Point /* new location */)
+
+// Relay a request from assistive technology to set the scroll offset
+// of an accessibility object that's a scroll container, to a specific
+// offset.
+IPC_MESSAGE_ROUTED2(AccessibilityMsg_SetScrollOffset,
+                    int /* object id */,
+                    gfx::Point /* new offset */)
+
+// Relay a request from assistive technology to set the cursor or
+// selection within a document.
+IPC_MESSAGE_ROUTED4(AccessibilityMsg_SetSelection,
+                    int /* New anchor object id */,
+                    int /* New anchor offset */,
+                    int /* New focus object id */,
+                    int /* New focus offset */)
+
+// Relay a request from assistive technology to set the value of an
+// editable text element.
+IPC_MESSAGE_ROUTED2(AccessibilityMsg_SetValue,
+                    int /* object id */,
+                    base::string16 /* Value */)
 
 // Determine the accessibility object under a given point.
 //