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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/accessibility/browser_accessibility_android.cc

Issue 116293005: Refactor content/ to use ui::AXNodeData instead of blink. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update content/DEPS instead of subdirs Created 6 years, 11 months 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 | « content/browser/accessibility/browser_accessibility_android.h ('k') | content/browser/accessibility/browser_accessibility_cocoa.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/accessibility/browser_accessibility_android.cc
diff --git a/content/browser/accessibility/browser_accessibility_android.cc b/content/browser/accessibility/browser_accessibility_android.cc
index b070475a060027f3cd4b8ee0477605d062b42fc7..b86374a02ec354ff79f3e20180ccf48b64ba865e 100644
--- a/content/browser/accessibility/browser_accessibility_android.cc
+++ b/content/browser/accessibility/browser_accessibility_android.cc
@@ -7,7 +7,6 @@
#include "base/strings/utf_string_conversions.h"
#include "content/browser/accessibility/browser_accessibility_manager_android.h"
#include "content/common/accessibility_messages.h"
-#include "content/common/accessibility_node_data.h"
namespace {
@@ -62,8 +61,8 @@ bool BrowserAccessibilityAndroid::PlatformIsLeaf() const {
// Iframes are always allowed to contain children.
if (IsIframe() ||
- role() == blink::WebAXRoleRootWebArea ||
- role() == blink::WebAXRoleWebArea) {
+ role() == ui::AX_ROLE_ROOT_WEB_AREA ||
+ role() == ui::AX_ROLE_WEB_AREA) {
return false;
}
@@ -73,11 +72,11 @@ bool BrowserAccessibilityAndroid::PlatformIsLeaf() const {
// Headings with text can drop their children.
base::string16 name = GetText();
- if (role() == blink::WebAXRoleHeading && !name.empty())
+ if (role() == ui::AX_ROLE_HEADING && !name.empty())
return true;
// Focusable nodes with text can drop their children.
- if (HasState(blink::WebAXStateFocusable) && !name.empty())
+ if (HasState(ui::AX_STATE_FOCUSABLE) && !name.empty())
return true;
// Nodes with only static text as children can drop their children.
@@ -92,18 +91,18 @@ bool BrowserAccessibilityAndroid::IsCheckable() const {
bool is_aria_pressed_defined;
bool is_mixed;
GetAriaTristate("aria-pressed", &is_aria_pressed_defined, &is_mixed);
- if (role() == blink::WebAXRoleCheckBox ||
- role() == blink::WebAXRoleRadioButton ||
+ if (role() == ui::AX_ROLE_CHECK_BOX ||
+ role() == ui::AX_ROLE_RADIO_BUTTON ||
is_aria_pressed_defined) {
checkable = true;
}
- if (HasState(blink::WebAXStateChecked))
+ if (HasState(ui::AX_STATE_CHECKED))
checkable = true;
return checkable;
}
bool BrowserAccessibilityAndroid::IsChecked() const {
- return HasState(blink::WebAXStateChecked);
+ return HasState(ui::AX_STATE_CHECKED);
}
bool BrowserAccessibilityAndroid::IsClickable() const {
@@ -111,21 +110,21 @@ bool BrowserAccessibilityAndroid::IsClickable() const {
}
bool BrowserAccessibilityAndroid::IsCollection() const {
- return (role() == blink::WebAXRoleGrid ||
- role() == blink::WebAXRoleList ||
- role() == blink::WebAXRoleListBox ||
- role() == blink::WebAXRoleTable ||
- role() == blink::WebAXRoleTree);
+ return (role() == ui::AX_ROLE_GRID ||
+ role() == ui::AX_ROLE_LIST ||
+ role() == ui::AX_ROLE_LIST_BOX ||
+ role() == ui::AX_ROLE_TABLE ||
+ role() == ui::AX_ROLE_TREE);
}
bool BrowserAccessibilityAndroid::IsCollectionItem() const {
- return (role() == blink::WebAXRoleCell ||
- role() == blink::WebAXRoleColumnHeader ||
- role() == blink::WebAXRoleDescriptionListTerm ||
- role() == blink::WebAXRoleListBoxOption ||
- role() == blink::WebAXRoleListItem ||
- role() == blink::WebAXRoleRowHeader ||
- role() == blink::WebAXRoleTreeItem);
+ return (role() == ui::AX_ROLE_CELL ||
+ role() == ui::AX_ROLE_COLUMN_HEADER ||
+ role() == ui::AX_ROLE_DESCRIPTION_LIST_TERM ||
+ role() == ui::AX_ROLE_LIST_BOX_OPTION ||
+ role() == ui::AX_ROLE_LIST_ITEM ||
+ role() == ui::AX_ROLE_ROW_HEADER ||
+ role() == ui::AX_ROLE_TREE_ITEM);
}
bool BrowserAccessibilityAndroid::IsContentInvalid() const {
@@ -138,13 +137,13 @@ bool BrowserAccessibilityAndroid::IsDismissable() const {
}
bool BrowserAccessibilityAndroid::IsEnabled() const {
- return HasState(blink::WebAXStateEnabled);
+ return HasState(ui::AX_STATE_ENABLED);
}
bool BrowserAccessibilityAndroid::IsFocusable() const {
- bool focusable = HasState(blink::WebAXStateFocusable);
+ bool focusable = HasState(ui::AX_STATE_FOCUSABLE);
if (IsIframe() ||
- role() == blink::WebAXRoleWebArea) {
+ role() == ui::AX_ROLE_WEB_AREA) {
focusable = false;
}
return focusable;
@@ -155,96 +154,96 @@ bool BrowserAccessibilityAndroid::IsFocused() const {
}
bool BrowserAccessibilityAndroid::IsHeading() const {
- return (role() == blink::WebAXRoleColumnHeader ||
- role() == blink::WebAXRoleHeading ||
- role() == blink::WebAXRoleRowHeader);
+ return (role() == ui::AX_ROLE_COLUMN_HEADER ||
+ role() == ui::AX_ROLE_HEADING ||
+ role() == ui::AX_ROLE_ROW_HEADER);
}
bool BrowserAccessibilityAndroid::IsHierarchical() const {
- return (role() == blink::WebAXRoleList ||
- role() == blink::WebAXRoleTree);
+ return (role() == ui::AX_ROLE_LIST ||
+ role() == ui::AX_ROLE_TREE);
}
bool BrowserAccessibilityAndroid::IsMultiLine() const {
- return role() == blink::WebAXRoleTextArea;
+ return role() == ui::AX_ROLE_TEXT_AREA;
}
bool BrowserAccessibilityAndroid::IsPassword() const {
- return HasState(blink::WebAXStateProtected);
+ return HasState(ui::AX_STATE_PROTECTED);
}
bool BrowserAccessibilityAndroid::IsRangeType() const {
- return (role() == blink::WebAXRoleProgressIndicator ||
- role() == blink::WebAXRoleScrollBar ||
- role() == blink::WebAXRoleSlider);
+ return (role() == ui::AX_ROLE_PROGRESS_INDICATOR ||
+ role() == ui::AX_ROLE_SCROLL_BAR ||
+ role() == ui::AX_ROLE_SLIDER);
}
bool BrowserAccessibilityAndroid::IsScrollable() const {
int dummy;
- return GetIntAttribute(AccessibilityNodeData::ATTR_SCROLL_X_MAX, &dummy);
+ return GetIntAttribute(ui::AX_ATTR_SCROLL_X_MAX, &dummy);
}
bool BrowserAccessibilityAndroid::IsSelected() const {
- return HasState(blink::WebAXStateSelected);
+ return HasState(ui::AX_STATE_SELECTED);
}
bool BrowserAccessibilityAndroid::IsVisibleToUser() const {
- return !HasState(blink::WebAXStateInvisible);
+ return !HasState(ui::AX_STATE_INVISIBLE);
}
bool BrowserAccessibilityAndroid::CanOpenPopup() const {
- return HasState(blink::WebAXStateHaspopup);
+ return HasState(ui::AX_STATE_HASPOPUP);
}
const char* BrowserAccessibilityAndroid::GetClassName() const {
const char* class_name = NULL;
switch(role()) {
- case blink::WebAXRoleEditableText:
- case blink::WebAXRoleSpinButton:
- case blink::WebAXRoleTextArea:
- case blink::WebAXRoleTextField:
+ case ui::AX_ROLE_EDITABLE_TEXT:
+ case ui::AX_ROLE_SPIN_BUTTON:
+ case ui::AX_ROLE_TEXT_AREA:
+ case ui::AX_ROLE_TEXT_FIELD:
class_name = "android.widget.EditText";
break;
- case blink::WebAXRoleSlider:
+ case ui::AX_ROLE_SLIDER:
class_name = "android.widget.SeekBar";
break;
- case blink::WebAXRoleComboBox:
+ case ui::AX_ROLE_COMBO_BOX:
class_name = "android.widget.Spinner";
break;
- case blink::WebAXRoleButton:
- case blink::WebAXRoleMenuButton:
- case blink::WebAXRolePopUpButton:
+ case ui::AX_ROLE_BUTTON:
+ case ui::AX_ROLE_MENU_BUTTON:
+ case ui::AX_ROLE_POP_UP_BUTTON:
class_name = "android.widget.Button";
break;
- case blink::WebAXRoleCheckBox:
+ case ui::AX_ROLE_CHECK_BOX:
class_name = "android.widget.CheckBox";
break;
- case blink::WebAXRoleRadioButton:
+ case ui::AX_ROLE_RADIO_BUTTON:
class_name = "android.widget.RadioButton";
break;
- case blink::WebAXRoleToggleButton:
+ case ui::AX_ROLE_TOGGLE_BUTTON:
class_name = "android.widget.ToggleButton";
break;
- case blink::WebAXRoleCanvas:
- case blink::WebAXRoleImage:
+ case ui::AX_ROLE_CANVAS:
+ case ui::AX_ROLE_IMAGE:
class_name = "android.widget.Image";
break;
- case blink::WebAXRoleProgressIndicator:
+ case ui::AX_ROLE_PROGRESS_INDICATOR:
class_name = "android.widget.ProgressBar";
break;
- case blink::WebAXRoleTabList:
+ case ui::AX_ROLE_TAB_LIST:
class_name = "android.widget.TabWidget";
break;
- case blink::WebAXRoleGrid:
- case blink::WebAXRoleTable:
+ case ui::AX_ROLE_GRID:
+ case ui::AX_ROLE_TABLE:
class_name = "android.widget.GridView";
break;
- case blink::WebAXRoleList:
- case blink::WebAXRoleListBox:
+ case ui::AX_ROLE_LIST:
+ case ui::AX_ROLE_LIST_BOX:
class_name = "android.widget.ListView";
break;
- case blink::WebAXRoleDialog:
+ case ui::AX_ROLE_DIALOG:
class_name = "android.app.Dialog";
break;
default:
@@ -257,12 +256,12 @@ const char* BrowserAccessibilityAndroid::GetClassName() const {
base::string16 BrowserAccessibilityAndroid::GetText() const {
if (IsIframe() ||
- role() == blink::WebAXRoleWebArea) {
+ role() == ui::AX_ROLE_WEB_AREA) {
return base::string16();
}
base::string16 description = GetString16Attribute(
- AccessibilityNodeData::ATTR_DESCRIPTION);
+ ui::AX_ATTR_DESCRIPTION);
base::string16 text;
if (!name().empty())
text = base::UTF8ToUTF16(name());
@@ -281,13 +280,13 @@ base::string16 BrowserAccessibilityAndroid::GetText() const {
}
switch(role()) {
- case blink::WebAXRoleImageMapLink:
- case blink::WebAXRoleLink:
+ case ui::AX_ROLE_IMAGE_MAP_LINK:
+ case ui::AX_ROLE_LINK:
if (!text.empty())
text += base::ASCIIToUTF16(" ");
text += base::ASCIIToUTF16("Link");
break;
- case blink::WebAXRoleHeading:
+ case ui::AX_ROLE_HEADING:
// Only append "heading" if this node already has text.
if (!text.empty())
text += base::ASCIIToUTF16(" Heading");
@@ -300,16 +299,16 @@ base::string16 BrowserAccessibilityAndroid::GetText() const {
int BrowserAccessibilityAndroid::GetItemIndex() const {
int index = 0;
switch(role()) {
- case blink::WebAXRoleListItem:
- case blink::WebAXRoleListBoxOption:
- case blink::WebAXRoleTreeItem:
+ case ui::AX_ROLE_LIST_ITEM:
+ case ui::AX_ROLE_LIST_BOX_OPTION:
+ case ui::AX_ROLE_TREE_ITEM:
index = index_in_parent();
break;
- case blink::WebAXRoleSlider:
- case blink::WebAXRoleProgressIndicator: {
+ case ui::AX_ROLE_SLIDER:
+ case ui::AX_ROLE_PROGRESS_INDICATOR: {
float value_for_range;
if (GetFloatAttribute(
- AccessibilityNodeData::ATTR_VALUE_FOR_RANGE, &value_for_range)) {
+ ui::AX_ATTR_VALUE_FOR_RANGE, &value_for_range)) {
index = static_cast<int>(value_for_range);
}
break;
@@ -321,14 +320,14 @@ int BrowserAccessibilityAndroid::GetItemIndex() const {
int BrowserAccessibilityAndroid::GetItemCount() const {
int count = 0;
switch(role()) {
- case blink::WebAXRoleList:
- case blink::WebAXRoleListBox:
+ case ui::AX_ROLE_LIST:
+ case ui::AX_ROLE_LIST_BOX:
count = PlatformChildCount();
break;
- case blink::WebAXRoleSlider:
- case blink::WebAXRoleProgressIndicator: {
+ case ui::AX_ROLE_SLIDER:
+ case ui::AX_ROLE_PROGRESS_INDICATOR: {
float max_value_for_range;
- if (GetFloatAttribute(AccessibilityNodeData::ATTR_MAX_VALUE_FOR_RANGE,
+ if (GetFloatAttribute(ui::AX_ATTR_MAX_VALUE_FOR_RANGE,
&max_value_for_range)) {
count = static_cast<int>(max_value_for_range);
}
@@ -340,25 +339,25 @@ int BrowserAccessibilityAndroid::GetItemCount() const {
int BrowserAccessibilityAndroid::GetScrollX() const {
int value = 0;
- GetIntAttribute(AccessibilityNodeData::ATTR_SCROLL_X, &value);
+ GetIntAttribute(ui::AX_ATTR_SCROLL_X, &value);
return value;
}
int BrowserAccessibilityAndroid::GetScrollY() const {
int value = 0;
- GetIntAttribute(AccessibilityNodeData::ATTR_SCROLL_Y, &value);
+ GetIntAttribute(ui::AX_ATTR_SCROLL_Y, &value);
return value;
}
int BrowserAccessibilityAndroid::GetMaxScrollX() const {
int value = 0;
- GetIntAttribute(AccessibilityNodeData::ATTR_SCROLL_X_MAX, &value);
+ GetIntAttribute(ui::AX_ATTR_SCROLL_X_MAX, &value);
return value;
}
int BrowserAccessibilityAndroid::GetMaxScrollY() const {
int value = 0;
- GetIntAttribute(AccessibilityNodeData::ATTR_SCROLL_Y_MAX, &value);
+ GetIntAttribute(ui::AX_ATTR_SCROLL_Y_MAX, &value);
return value;
}
@@ -414,13 +413,13 @@ base::string16 BrowserAccessibilityAndroid::GetTextChangeBeforeText() const {
int BrowserAccessibilityAndroid::GetSelectionStart() const {
int sel_start = 0;
- GetIntAttribute(AccessibilityNodeData::ATTR_TEXT_SEL_START, &sel_start);
+ GetIntAttribute(ui::AX_ATTR_TEXT_SEL_START, &sel_start);
return sel_start;
}
int BrowserAccessibilityAndroid::GetSelectionEnd() const {
int sel_end = 0;
- GetIntAttribute(AccessibilityNodeData::ATTR_TEXT_SEL_END, &sel_end);
+ GetIntAttribute(ui::AX_ATTR_TEXT_SEL_END, &sel_end);
return sel_end;
}
@@ -430,7 +429,7 @@ int BrowserAccessibilityAndroid::GetEditableTextLength() const {
int BrowserAccessibilityAndroid::AndroidInputType() const {
std::string html_tag = GetStringAttribute(
- AccessibilityNodeData::ATTR_HTML_TAG);
+ ui::AX_ATTR_HTML_TAG);
if (html_tag != "input")
return ANDROID_TEXT_INPUTTYPE_TYPE_NULL;
@@ -466,7 +465,7 @@ int BrowserAccessibilityAndroid::AndroidInputType() const {
int BrowserAccessibilityAndroid::AndroidLiveRegionType() const {
std::string live = GetStringAttribute(
- AccessibilityNodeData::ATTR_LIVE_STATUS);
+ ui::AX_ATTR_LIVE_STATUS);
if (live == "polite")
return ANDROID_VIEW_VIEW_ACCESSIBILITY_LIVE_REGION_POLITE;
else if (live == "assertive")
@@ -479,14 +478,14 @@ int BrowserAccessibilityAndroid::AndroidRangeType() const {
}
int BrowserAccessibilityAndroid::RowCount() const {
- if (role() == blink::WebAXRoleGrid ||
- role() == blink::WebAXRoleTable) {
- return CountChildrenWithRole(blink::WebAXRoleRow);
+ if (role() == ui::AX_ROLE_GRID ||
+ role() == ui::AX_ROLE_TABLE) {
+ return CountChildrenWithRole(ui::AX_ROLE_ROW);
}
- if (role() == blink::WebAXRoleList ||
- role() == blink::WebAXRoleListBox ||
- role() == blink::WebAXRoleTree) {
+ if (role() == ui::AX_ROLE_LIST ||
+ role() == ui::AX_ROLE_LIST_BOX ||
+ role() == ui::AX_ROLE_TREE) {
return PlatformChildCount();
}
@@ -494,45 +493,45 @@ int BrowserAccessibilityAndroid::RowCount() const {
}
int BrowserAccessibilityAndroid::ColumnCount() const {
- if (role() == blink::WebAXRoleGrid ||
- role() == blink::WebAXRoleTable) {
- return CountChildrenWithRole(blink::WebAXRoleColumn);
+ if (role() == ui::AX_ROLE_GRID ||
+ role() == ui::AX_ROLE_TABLE) {
+ return CountChildrenWithRole(ui::AX_ROLE_COLUMN);
}
return 0;
}
int BrowserAccessibilityAndroid::RowIndex() const {
- if (role() == blink::WebAXRoleListItem ||
- role() == blink::WebAXRoleListBoxOption ||
- role() == blink::WebAXRoleTreeItem) {
+ if (role() == ui::AX_ROLE_LIST_ITEM ||
+ role() == ui::AX_ROLE_LIST_BOX_OPTION ||
+ role() == ui::AX_ROLE_TREE_ITEM) {
return index_in_parent();
}
- return GetIntAttribute(AccessibilityNodeData::ATTR_TABLE_CELL_ROW_INDEX);
+ return GetIntAttribute(ui::AX_ATTR_TABLE_CELL_ROW_INDEX);
}
int BrowserAccessibilityAndroid::RowSpan() const {
- return GetIntAttribute(AccessibilityNodeData::ATTR_TABLE_CELL_ROW_SPAN);
+ return GetIntAttribute(ui::AX_ATTR_TABLE_CELL_ROW_SPAN);
}
int BrowserAccessibilityAndroid::ColumnIndex() const {
- return GetIntAttribute(AccessibilityNodeData::ATTR_TABLE_CELL_COLUMN_INDEX);
+ return GetIntAttribute(ui::AX_ATTR_TABLE_CELL_COLUMN_INDEX);
}
int BrowserAccessibilityAndroid::ColumnSpan() const {
- return GetIntAttribute(AccessibilityNodeData::ATTR_TABLE_CELL_COLUMN_SPAN);
+ return GetIntAttribute(ui::AX_ATTR_TABLE_CELL_COLUMN_SPAN);
}
float BrowserAccessibilityAndroid::RangeMin() const {
- return GetFloatAttribute(AccessibilityNodeData::ATTR_MIN_VALUE_FOR_RANGE);
+ return GetFloatAttribute(ui::AX_ATTR_MIN_VALUE_FOR_RANGE);
}
float BrowserAccessibilityAndroid::RangeMax() const {
- return GetFloatAttribute(AccessibilityNodeData::ATTR_MAX_VALUE_FOR_RANGE);
+ return GetFloatAttribute(ui::AX_ATTR_MAX_VALUE_FOR_RANGE);
}
float BrowserAccessibilityAndroid::RangeCurrentValue() const {
- return GetFloatAttribute(AccessibilityNodeData::ATTR_VALUE_FOR_RANGE);
+ return GetFloatAttribute(ui::AX_ATTR_VALUE_FOR_RANGE);
}
bool BrowserAccessibilityAndroid::HasFocusableChild() const {
@@ -540,7 +539,7 @@ bool BrowserAccessibilityAndroid::HasFocusableChild() const {
// from within this!
for (uint32 i = 0; i < child_count(); i++) {
BrowserAccessibility* child = children()[i];
- if (child->HasState(blink::WebAXStateFocusable))
+ if (child->HasState(ui::AX_STATE_FOCUSABLE))
return true;
if (static_cast<BrowserAccessibilityAndroid*>(child)->HasFocusableChild())
return true;
@@ -553,7 +552,7 @@ bool BrowserAccessibilityAndroid::HasOnlyStaticTextChildren() const {
// from within this!
for (uint32 i = 0; i < child_count(); i++) {
BrowserAccessibility* child = children()[i];
- if (child->role() != blink::WebAXRoleStaticText)
+ if (child->role() != ui::AX_ROLE_STATIC_TEXT)
return false;
}
return true;
@@ -561,7 +560,7 @@ bool BrowserAccessibilityAndroid::HasOnlyStaticTextChildren() const {
bool BrowserAccessibilityAndroid::IsIframe() const {
base::string16 html_tag = GetString16Attribute(
- AccessibilityNodeData::ATTR_HTML_TAG);
+ ui::AX_ATTR_HTML_TAG);
return html_tag == base::ASCIIToUTF16("iframe");
}
@@ -575,12 +574,12 @@ void BrowserAccessibilityAndroid::PostInitialize() {
}
}
- if (role() == blink::WebAXRoleAlert && first_time_)
- manager()->NotifyAccessibilityEvent(blink::WebAXEventAlert, this);
+ if (role() == ui::AX_ROLE_ALERT && first_time_)
+ manager()->NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, this);
base::string16 live;
if (GetString16Attribute(
- AccessibilityNodeData::ATTR_CONTAINER_LIVE_STATUS, &live)) {
+ ui::AX_ATTR_CONTAINER_LIVE_STATUS, &live)) {
NotifyLiveRegionUpdate(live);
}
@@ -596,15 +595,14 @@ void BrowserAccessibilityAndroid::NotifyLiveRegionUpdate(
base::string16 text = GetText();
if (cached_text_ != text) {
if (!text.empty()) {
- manager()->NotifyAccessibilityEvent(blink::WebAXEventShow,
+ manager()->NotifyAccessibilityEvent(ui::AX_EVENT_SHOW,
this);
}
cached_text_ = text;
}
}
-int BrowserAccessibilityAndroid::CountChildrenWithRole(
- blink::WebAXRole role) const {
+int BrowserAccessibilityAndroid::CountChildrenWithRole(ui::AXRole role) const {
int count = 0;
for (uint32 i = 0; i < PlatformChildCount(); i++) {
if (PlatformGetChild(i)->role() == role)
« no previous file with comments | « content/browser/accessibility/browser_accessibility_android.h ('k') | content/browser/accessibility/browser_accessibility_cocoa.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698