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

Unified Diff: third_party/WebKit/Source/modules/accessibility/AXObject.cpp

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
Index: third_party/WebKit/Source/modules/accessibility/AXObject.cpp
diff --git a/third_party/WebKit/Source/modules/accessibility/AXObject.cpp b/third_party/WebKit/Source/modules/accessibility/AXObject.cpp
index 9c141b51f5a12c920a361bcc8dc36a0087827615..bc0a87f1f01a031efaa690be400c538633150678 100644
--- a/third_party/WebKit/Source/modules/accessibility/AXObject.cpp
+++ b/third_party/WebKit/Source/modules/accessibility/AXObject.cpp
@@ -904,33 +904,28 @@ AccessibilityOrientation AXObject::orientation() const {
return AccessibilityOrientationUndefined;
}
-static String queryString(WebLocalizedString::Name name) {
- return Locale::defaultLocale().queryString(name);
-}
-
-String AXObject::actionVerb() const {
+AXSupportedAction AXObject::action() const {
if (!actionElement())
- return emptyString();
+ return AXSupportedAction::None;
switch (roleValue()) {
case ButtonRole:
case ToggleButtonRole:
- return queryString(WebLocalizedString::AXButtonActionVerb);
+ return AXSupportedAction::Press;
case TextFieldRole:
- return queryString(WebLocalizedString::AXTextFieldActionVerb);
+ return AXSupportedAction::Activate;
case RadioButtonRole:
- return queryString(WebLocalizedString::AXRadioButtonActionVerb);
+ return AXSupportedAction::Select;
case CheckBoxRole:
case SwitchRole:
- return queryString(
- isChecked() ? WebLocalizedString::AXCheckedCheckBoxActionVerb
- : WebLocalizedString::AXUncheckedCheckBoxActionVerb);
+ return isChecked() ? AXSupportedAction::Check
+ : AXSupportedAction::Uncheck;
case LinkRole:
- return queryString(WebLocalizedString::AXLinkActionVerb);
+ return AXSupportedAction::Jump;
case PopUpButtonRole:
- return queryString(WebLocalizedString::AXPopUpButtonActionVerb);
+ return AXSupportedAction::Open;
default:
- return queryString(WebLocalizedString::AXDefaultActionVerb);
+ return AXSupportedAction::Click;
}
}
« no previous file with comments | « third_party/WebKit/Source/modules/accessibility/AXObject.h ('k') | third_party/WebKit/Source/web/AssertMatchingEnums.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698