Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Unified Diff: ui/accessibility/ax_node_data.cc

Issue 2518183002: Moved action verbs out of Blink. (Closed)
Patch Set: Added missing braces. Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/accessibility/ax_enums.idl ('k') | ui/accessibility/ax_text_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/accessibility/ax_node_data.cc
diff --git a/ui/accessibility/ax_node_data.cc b/ui/accessibility/ax_node_data.cc
index 5d14645b231bf2e22f8aa83f1a820363793cd4c6..5a7d6c70e631b078fab4df4748f67e0560623f09 100644
--- a/ui/accessibility/ax_node_data.cc
+++ b/ui/accessibility/ax_node_data.cc
@@ -13,6 +13,7 @@
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
+#include "ui/accessibility/ax_text_utils.h"
#include "ui/gfx/transform.h"
using base::DoubleToString;
@@ -394,6 +395,12 @@ std::string AXNodeData::ToString() const {
for (size_t i = 0; i < int_attributes.size(); ++i) {
std::string value = IntToString(int_attributes[i].second);
switch (int_attributes[i].first) {
+ case AX_ATTR_ACTION:
+ result +=
+ " action=" +
+ base::UTF16ToUTF8(ActionToUnlocalizedString(
+ static_cast<AXSupportedAction>(int_attributes[i].second)));
+ break;
case AX_ATTR_SCROLL_X:
result += " scroll_x=" + value;
break;
@@ -471,12 +478,14 @@ std::string AXNodeData::ToString() const {
}
break;
case AX_ATTR_NAME_FROM:
- result += " name_from=" + ui::ToString(
- static_cast<ui::AXNameFrom>(int_attributes[i].second));
+ result +=
+ " name_from=" +
+ ui::ToString(static_cast<AXNameFrom>(int_attributes[i].second));
break;
case AX_ATTR_DESCRIPTION_FROM:
- result += " description_from=" + ui::ToString(
- static_cast<ui::AXDescriptionFrom>(int_attributes[i].second));
+ result += " description_from=" +
+ ui::ToString(
+ static_cast<AXDescriptionFrom>(int_attributes[i].second));
break;
case AX_ATTR_ACTIVEDESCENDANT_ID:
result += " activedescendant=" + value;
@@ -597,9 +606,6 @@ std::string AXNodeData::ToString() const {
case AX_ATTR_ACCESS_KEY:
result += " access_key=" + value;
break;
- case AX_ATTR_ACTION:
- result += " action=" + value;
- break;
case AX_ATTR_ARIA_INVALID_VALUE:
result += " aria_invalid_value=" + value;
break;
« no previous file with comments | « ui/accessibility/ax_enums.idl ('k') | ui/accessibility/ax_text_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698