| Index: ui/accessibility/ax_node_data.cc
|
| diff --git a/ui/accessibility/ax_node_data.cc b/ui/accessibility/ax_node_data.cc
|
| index 26a5bcc2747138423a42f14875b81a649da2b0cd..3b263a9d9617c1af6f1bd11d1641d93f5738a1fc 100644
|
| --- a/ui/accessibility/ax_node_data.cc
|
| +++ b/ui/accessibility/ax_node_data.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "ui/accessibility/ax_node_data.h"
|
|
|
| +#include <stddef.h>
|
| +
|
| #include <algorithm>
|
| #include <set>
|
|
|
| @@ -178,17 +180,17 @@ bool AXNodeData::HasIntListAttribute(AXIntListAttribute attribute) const {
|
| return iter != intlist_attributes.end();
|
| }
|
|
|
| -const std::vector<int32>& AXNodeData::GetIntListAttribute(
|
| +const std::vector<int32_t>& AXNodeData::GetIntListAttribute(
|
| AXIntListAttribute attribute) const {
|
| - CR_DEFINE_STATIC_LOCAL(std::vector<int32>, empty_vector, ());
|
| + CR_DEFINE_STATIC_LOCAL(std::vector<int32_t>, empty_vector, ());
|
| auto iter = FindInVectorOfPairs(attribute, intlist_attributes);
|
| if (iter != intlist_attributes.end())
|
| return iter->second;
|
| return empty_vector;
|
| }
|
|
|
| -bool AXNodeData::GetIntListAttribute(
|
| - AXIntListAttribute attribute, std::vector<int32>* value) const {
|
| +bool AXNodeData::GetIntListAttribute(AXIntListAttribute attribute,
|
| + std::vector<int32_t>* value) const {
|
| auto iter = FindInVectorOfPairs(attribute, intlist_attributes);
|
| if (iter != intlist_attributes.end()) {
|
| *value = iter->second;
|
| @@ -240,8 +242,8 @@ void AXNodeData::AddBoolAttribute(
|
| bool_attributes.push_back(std::make_pair(attribute, value));
|
| }
|
|
|
| -void AXNodeData::AddIntListAttribute(
|
| - AXIntListAttribute attribute, const std::vector<int32>& value) {
|
| +void AXNodeData::AddIntListAttribute(AXIntListAttribute attribute,
|
| + const std::vector<int32_t>& value) {
|
| intlist_attributes.push_back(std::make_pair(attribute, value));
|
| }
|
|
|
| @@ -589,7 +591,7 @@ std::string AXNodeData::ToString() const {
|
| }
|
|
|
| for (size_t i = 0; i < intlist_attributes.size(); ++i) {
|
| - const std::vector<int32>& values = intlist_attributes[i].second;
|
| + const std::vector<int32_t>& values = intlist_attributes[i].second;
|
| switch (intlist_attributes[i].first) {
|
| case AX_ATTR_INDIRECT_CHILD_IDS:
|
| result += " indirect_child_ids=" + IntVectorToString(values);
|
|
|