Refactor all accessibility code out of webkit/glue.

content/common/accessibility_messages.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.
 
 // IPC messages for accessibility.
 // Multiply-included message file, hence no include guard.
 
 #include "base/basictypes.h"
+#include "content/common/accessibility_node_data.h"
 #include "content/common/content_export.h"
 #include "content/common/view_message_enums.h"
 #include "content/public/common/common_param_traits.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_utils.h"
 #include "ipc/ipc_param_traits.h"
 #include "ipc/param_traits_macros.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
-#include "webkit/glue/webaccessibility.h"
 
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
 
 #define IPC_MESSAGE_START AccessibilityMsgStart
 
 #ifndef CONTENT_COMMON_ACCESSIBILITY_MESSAGES_H_
 #define CONTENT_COMMON_ACCESSIBILITY_MESSAGES_H_
 
 enum AccessibilityNotification {
@@ skipping 61 matching lines @@
   AccessibilityNotificationTextRemoved,
 
   // The node value has changed.
   AccessibilityNotificationValueChanged,
 };
 
 #endif  // CONTENT_COMMON_ACCESSIBILITY_MESSAGES_H_
 
 IPC_ENUM_TRAITS(AccessibilityNotification)
 
-IPC_ENUM_TRAITS(webkit_glue::WebAccessibility::BoolAttribute)
-IPC_ENUM_TRAITS(webkit_glue::WebAccessibility::FloatAttribute)
-IPC_ENUM_TRAITS(webkit_glue::WebAccessibility::IntAttribute)
-IPC_ENUM_TRAITS(webkit_glue::WebAccessibility::Role)
-IPC_ENUM_TRAITS(webkit_glue::WebAccessibility::State)
-IPC_ENUM_TRAITS(webkit_glue::WebAccessibility::StringAttribute)
+IPC_ENUM_TRAITS(content::AccessibilityNodeData::BoolAttribute)
+IPC_ENUM_TRAITS(content::AccessibilityNodeData::FloatAttribute)
+IPC_ENUM_TRAITS(content::AccessibilityNodeData::IntAttribute)
+IPC_ENUM_TRAITS(content::AccessibilityNodeData::Role)
+IPC_ENUM_TRAITS(content::AccessibilityNodeData::State)
+IPC_ENUM_TRAITS(content::AccessibilityNodeData::StringAttribute)
 
-IPC_STRUCT_TRAITS_BEGIN(webkit_glue::WebAccessibility)
+IPC_STRUCT_TRAITS_BEGIN(content::AccessibilityNodeData)
   IPC_STRUCT_TRAITS_MEMBER(id)
   IPC_STRUCT_TRAITS_MEMBER(name)
   IPC_STRUCT_TRAITS_MEMBER(value)
   IPC_STRUCT_TRAITS_MEMBER(role)
   IPC_STRUCT_TRAITS_MEMBER(state)
   IPC_STRUCT_TRAITS_MEMBER(location)
   IPC_STRUCT_TRAITS_MEMBER(string_attributes)
   IPC_STRUCT_TRAITS_MEMBER(int_attributes)
   IPC_STRUCT_TRAITS_MEMBER(float_attributes)
   IPC_STRUCT_TRAITS_MEMBER(bool_attributes)
   IPC_STRUCT_TRAITS_MEMBER(children)
   IPC_STRUCT_TRAITS_MEMBER(indirect_child_ids)
   IPC_STRUCT_TRAITS_MEMBER(html_attributes)
   IPC_STRUCT_TRAITS_MEMBER(line_breaks)
   IPC_STRUCT_TRAITS_MEMBER(cell_ids)
   IPC_STRUCT_TRAITS_MEMBER(unique_cell_ids)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_BEGIN(AccessibilityHostMsg_NotificationParams)
   // Type of notification.
   IPC_STRUCT_MEMBER(AccessibilityNotification, notification_type)
 
   // ID of the node that the notification applies to.
   IPC_STRUCT_MEMBER(int, id)
 
   // The accessibility node tree.
-  IPC_STRUCT_MEMBER(webkit_glue::WebAccessibility, acc_tree)
+  IPC_STRUCT_MEMBER(content::AccessibilityNodeData, acc_tree)
 
   // Whether children are included in this tree, otherwise it's just an
   // update to this one node and existing children are left in place.
   IPC_STRUCT_MEMBER(bool, includes_children)
 IPC_STRUCT_END()
 
 // Messages sent from the browser to the renderer.
 
 // Relay a request from assistive technology to set focus to a given node.
 IPC_MESSAGE_ROUTED1(AccessibilityMsg_SetFocus,
@@ skipping 31 matching lines @@
 // message was processed and it can send addition notifications.
 IPC_MESSAGE_ROUTED0(AccessibilityMsg_Notifications_ACK)
 
 // Messages sent from the renderer to the browser.
 
 // Sent to notify the browser about renderer accessibility notifications.
 // The browser responds with a AccessibilityMsg_Notifications_ACK.
 IPC_MESSAGE_ROUTED1(
     AccessibilityHostMsg_Notifications,
     std::vector<AccessibilityHostMsg_NotificationParams>)