| 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 a74f0082ad154bb8084827df6173b0fbcdca38ac..8ce7edf99ac3966a2ca5de0b6770e89e269adbb8 100644
|
| --- a/content/browser/accessibility/browser_accessibility_android.cc
|
| +++ b/content/browser/accessibility/browser_accessibility_android.cc
|
| @@ -15,6 +15,7 @@
|
| #include "content/public/common/content_client.h"
|
| #include "third_party/skia/include/core/SkColor.h"
|
| #include "ui/accessibility/platform/ax_android_constants.h"
|
| +#include "ui/accessibility/platform/ax_snapshot_node_android_platform.h"
|
|
|
| namespace {
|
|
|
| @@ -328,80 +329,8 @@ bool BrowserAccessibilityAndroid::CanOpenPopup() const {
|
| }
|
|
|
| const char* BrowserAccessibilityAndroid::GetClassName() const {
|
| - const char* class_name = NULL;
|
| -
|
| - switch (GetRole()) {
|
| - case ui::AX_ROLE_SEARCH_BOX:
|
| - case ui::AX_ROLE_SPIN_BUTTON:
|
| - case ui::AX_ROLE_TEXT_FIELD:
|
| - class_name = ui::kAXEditTextClassname;
|
| - break;
|
| - case ui::AX_ROLE_SLIDER:
|
| - class_name = ui::kAXSeekBarClassname;
|
| - break;
|
| - case ui::AX_ROLE_COLOR_WELL:
|
| - case ui::AX_ROLE_COMBO_BOX:
|
| - case ui::AX_ROLE_DATE:
|
| - case ui::AX_ROLE_POP_UP_BUTTON:
|
| - case ui::AX_ROLE_INPUT_TIME:
|
| - class_name = ui::kAXSpinnerClassname;
|
| - break;
|
| - case ui::AX_ROLE_BUTTON:
|
| - case ui::AX_ROLE_MENU_BUTTON:
|
| - class_name = ui::kAXButtonClassname;
|
| - break;
|
| - case ui::AX_ROLE_CHECK_BOX:
|
| - case ui::AX_ROLE_SWITCH:
|
| - class_name = ui::kAXCheckBoxClassname;
|
| - break;
|
| - case ui::AX_ROLE_RADIO_BUTTON:
|
| - class_name = ui::kAXRadioButtonClassname;
|
| - break;
|
| - case ui::AX_ROLE_TOGGLE_BUTTON:
|
| - class_name = ui::kAXToggleButtonClassname;
|
| - break;
|
| - case ui::AX_ROLE_CANVAS:
|
| - case ui::AX_ROLE_IMAGE:
|
| - case ui::AX_ROLE_SVG_ROOT:
|
| - class_name = ui::kAXImageClassname;
|
| - break;
|
| - case ui::AX_ROLE_METER:
|
| - case ui::AX_ROLE_PROGRESS_INDICATOR:
|
| - class_name = ui::kAXProgressBarClassname;
|
| - break;
|
| - case ui::AX_ROLE_TAB_LIST:
|
| - class_name = ui::kAXTabWidgetClassname;
|
| - break;
|
| - case ui::AX_ROLE_GRID:
|
| - case ui::AX_ROLE_TREE_GRID:
|
| - case ui::AX_ROLE_TABLE:
|
| - class_name = ui::kAXGridViewClassname;
|
| - break;
|
| - case ui::AX_ROLE_LIST:
|
| - case ui::AX_ROLE_LIST_BOX:
|
| - case ui::AX_ROLE_DESCRIPTION_LIST:
|
| - class_name = ui::kAXListViewClassname;
|
| - break;
|
| - case ui::AX_ROLE_DIALOG:
|
| - class_name = ui::kAXDialogClassname;
|
| - break;
|
| - case ui::AX_ROLE_ROOT_WEB_AREA:
|
| - if (PlatformGetParent() == nullptr)
|
| - class_name = ui::kAXWebViewClassname;
|
| - else
|
| - class_name = ui::kAXViewClassname;
|
| - break;
|
| - case ui::AX_ROLE_MENU_ITEM:
|
| - case ui::AX_ROLE_MENU_ITEM_CHECK_BOX:
|
| - case ui::AX_ROLE_MENU_ITEM_RADIO:
|
| - class_name = ui::kAXMenuItemClassname;
|
| - break;
|
| - default:
|
| - class_name = ui::kAXViewClassname;
|
| - break;
|
| - }
|
| -
|
| - return class_name;
|
| + return ui::AXSnapshotNodeAndroid::AXRoleToAndroidClassName(
|
| + GetRole(), PlatformGetParent() != nullptr);
|
| }
|
|
|
| base::string16 BrowserAccessibilityAndroid::GetText() const {
|
|
|