diff options
| author | dmazzoni@google.com <dmazzoni@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-06 22:30:54 +0000 |
|---|---|---|
| committer | dmazzoni@google.com <dmazzoni@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-06 22:30:54 +0000 |
| commit | 5eec2f56c9ad54bbb2ed150d67a2b46d9a01cc68 (patch) | |
| tree | 73f3a82eb83f997dd4454fca180da67640dce643 /content/common/accessibility_messages.h | |
| parent | 06173a82fdb09588840ceea826486beb83fbe4fd (diff) | |
| download | chromium_src-5eec2f56c9ad54bbb2ed150d67a2b46d9a01cc68.zip chromium_src-5eec2f56c9ad54bbb2ed150d67a2b46d9a01cc68.tar.gz chromium_src-5eec2f56c9ad54bbb2ed150d67a2b46d9a01cc68.tar.bz2 | |
Refactor content/ to use ui::AXNodeData instead of blink.
This is a huge change, but it's all refactoring / renaming.
There should be no new logic.
BUG=316726
R=dtseng@chromium.org, jam@chromium.org, tsepez@chromium.org
Review URL: https://codereview.chromium.org/116293005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243187 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/accessibility_messages.h')
| -rw-r--r-- | content/common/accessibility_messages.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/content/common/accessibility_messages.h b/content/common/accessibility_messages.h index 05ff75c..8f48ede 100644 --- a/content/common/accessibility_messages.h +++ b/content/common/accessibility_messages.h @@ -6,7 +6,6 @@ // 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" @@ -15,22 +14,23 @@ #include "ipc/ipc_param_traits.h" #include "ipc/param_traits_macros.h" #include "third_party/WebKit/public/web/WebAXEnums.h" +#include "ui/accessibility/ax_node_data.h" #undef IPC_MESSAGE_EXPORT #define IPC_MESSAGE_EXPORT CONTENT_EXPORT #define IPC_MESSAGE_START AccessibilityMsgStart -IPC_ENUM_TRAITS(blink::WebAXEvent) -IPC_ENUM_TRAITS(blink::WebAXRole) +IPC_ENUM_TRAITS(ui::AXEvent) +IPC_ENUM_TRAITS(ui::AXRole) -IPC_ENUM_TRAITS(content::AccessibilityNodeData::BoolAttribute) -IPC_ENUM_TRAITS(content::AccessibilityNodeData::FloatAttribute) -IPC_ENUM_TRAITS(content::AccessibilityNodeData::IntAttribute) -IPC_ENUM_TRAITS(content::AccessibilityNodeData::IntListAttribute) -IPC_ENUM_TRAITS(content::AccessibilityNodeData::StringAttribute) +IPC_ENUM_TRAITS(ui::AXBoolAttribute) +IPC_ENUM_TRAITS(ui::AXFloatAttribute) +IPC_ENUM_TRAITS(ui::AXIntAttribute) +IPC_ENUM_TRAITS(ui::AXIntListAttribute) +IPC_ENUM_TRAITS(ui::AXStringAttribute) -IPC_STRUCT_TRAITS_BEGIN(content::AccessibilityNodeData) +IPC_STRUCT_TRAITS_BEGIN(ui::AXNodeData) IPC_STRUCT_TRAITS_MEMBER(id) IPC_STRUCT_TRAITS_MEMBER(role) IPC_STRUCT_TRAITS_MEMBER(state) @@ -47,10 +47,10 @@ IPC_STRUCT_TRAITS_END() IPC_STRUCT_BEGIN(AccessibilityHostMsg_EventParams) // Vector of nodes in the tree that need to be updated before // sending the event. - IPC_STRUCT_MEMBER(std::vector<content::AccessibilityNodeData>, nodes) + IPC_STRUCT_MEMBER(std::vector<ui::AXNodeData>, nodes) // Type of event. - IPC_STRUCT_MEMBER(blink::WebAXEvent, event_type) + IPC_STRUCT_MEMBER(ui::AXEvent, event_type) // ID of the node that the event applies to. IPC_STRUCT_MEMBER(int, id) |