| 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 934cdc6b7c1a0bb93cb9787fd104cbe178ff0fbb..78fc0709d3902e742ecfcac1ef68a8ce6cad8fe7 100644
|
| --- a/content/browser/accessibility/browser_accessibility_android.cc
|
| +++ b/content/browser/accessibility/browser_accessibility_android.cc
|
| @@ -432,6 +432,8 @@ base::string16 BrowserAccessibilityAndroid::GetText() const {
|
| case ui::AX_ROLE_POP_UP_BUTTON:
|
| case ui::AX_ROLE_TEXT_FIELD:
|
| return value;
|
| + default:
|
| + break;
|
| }
|
| }
|
|
|
| @@ -534,6 +536,9 @@ base::string16 BrowserAccessibilityAndroid::GetRoleDescription() const {
|
| case ui::AX_ROLE_ARTICLE:
|
| message_id = IDS_AX_ROLE_ARTICLE;
|
| break;
|
| + case ui::AX_ROLE_AUDIO:
|
| + message_id = IDS_AX_MEDIA_AUDIO_ELEMENT;
|
| + break;
|
| case ui::AX_ROLE_BANNER:
|
| message_id = IDS_AX_ROLE_BANNER;
|
| break;
|
| @@ -624,6 +629,9 @@ base::string16 BrowserAccessibilityAndroid::GetRoleDescription() const {
|
| case ui::AX_ROLE_EMBEDDED_OBJECT:
|
| message_id = IDS_AX_ROLE_EMBEDDED_OBJECT;
|
| break;
|
| + case ui::AX_ROLE_FEED:
|
| + // TODO(patricialor): Add a string for this role.
|
| + break;
|
| case ui::AX_ROLE_FIGCAPTION:
|
| // No role description.
|
| break;
|
| @@ -716,6 +724,9 @@ base::string16 BrowserAccessibilityAndroid::GetRoleDescription() const {
|
| case ui::AX_ROLE_MATH:
|
| message_id = IDS_AX_ROLE_MATH;
|
| break;
|
| + case ui::AX_ROLE_MENU:
|
| + message_id = IDS_AX_ROLE_MENU;
|
| + break;
|
| case ui::AX_ROLE_MENU_BAR:
|
| message_id = IDS_AX_ROLE_MENU_BAR;
|
| break;
|
| @@ -737,9 +748,6 @@ base::string16 BrowserAccessibilityAndroid::GetRoleDescription() const {
|
| case ui::AX_ROLE_MENU_LIST_POPUP:
|
| // No role description.
|
| break;
|
| - case ui::AX_ROLE_MENU:
|
| - message_id = IDS_AX_ROLE_MENU;
|
| - break;
|
| case ui::AX_ROLE_METER:
|
| message_id = IDS_AX_ROLE_METER;
|
| break;
|
| @@ -854,6 +862,9 @@ base::string16 BrowserAccessibilityAndroid::GetRoleDescription() const {
|
| case ui::AX_ROLE_TABLE:
|
| message_id = IDS_AX_ROLE_TABLE;
|
| break;
|
| + case ui::AX_ROLE_TERM:
|
| + message_id = IDS_AX_ROLE_DESCRIPTION_TERM;
|
| + break;
|
| case ui::AX_ROLE_TEXT_FIELD:
|
| // No role description.
|
| break;
|
| @@ -887,6 +898,9 @@ base::string16 BrowserAccessibilityAndroid::GetRoleDescription() const {
|
| case ui::AX_ROLE_TOOLTIP:
|
| message_id = IDS_AX_ROLE_TOOLTIP;
|
| break;
|
| + case ui::AX_ROLE_VIDEO:
|
| + message_id = IDS_AX_MEDIA_VIDEO_ELEMENT;
|
| + break;
|
| case ui::AX_ROLE_WEB_AREA:
|
| // No role description.
|
| break;
|
| @@ -896,6 +910,9 @@ base::string16 BrowserAccessibilityAndroid::GetRoleDescription() const {
|
| case ui::AX_ROLE_WINDOW:
|
| // No role description.
|
| break;
|
| + case ui::AX_ROLE_NONE:
|
| + // No role description.
|
| + break;
|
| }
|
|
|
| if (message_id != -1)
|
| @@ -923,6 +940,8 @@ int BrowserAccessibilityAndroid::GetItemIndex() const {
|
| index = static_cast<int>(((value - min)) * 100 / (max - min));
|
| break;
|
| }
|
| + default:
|
| + break;
|
| }
|
| return index;
|
| }
|
| @@ -942,6 +961,8 @@ int BrowserAccessibilityAndroid::GetItemCount() const {
|
| // in RangeMin and RangeMax.
|
| count = 100;
|
| break;
|
| + default:
|
| + break;
|
| }
|
| return count;
|
| }
|
|
|