diff options
| author | dtseng@chromium.org <dtseng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-24 23:20:08 +0000 |
|---|---|---|
| committer | dtseng@chromium.org <dtseng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-24 23:20:08 +0000 |
| commit | 8ab402196ee4dc510e0162010789d43b96b54243 (patch) | |
| tree | ee061500a2a3cacd6f6fb9419e4fb2a6f5f4e39e /views/accessibility | |
| parent | 01b12ba89a6117a849ac2537d58991c76f2f2da2 (diff) | |
| download | chromium_src-8ab402196ee4dc510e0162010789d43b96b54243.zip chromium_src-8ab402196ee4dc510e0162010789d43b96b54243.tar.gz chromium_src-8ab402196ee4dc510e0162010789d43b96b54243.tar.bz2 | |
Fix radiobuttons and connect up child widgets again.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2806030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50778 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/accessibility')
| -rw-r--r-- | views/accessibility/accessibility_types.h | 1 | ||||
| -rw-r--r-- | views/accessibility/view_accessibility.cc | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/views/accessibility/accessibility_types.h b/views/accessibility/accessibility_types.h index 7dd991c..79108b1 100644 --- a/views/accessibility/accessibility_types.h +++ b/views/accessibility/accessibility_types.h @@ -55,6 +55,7 @@ class AccessibilityTypes { ROLE_PANE, ROLE_PROGRESSBAR, ROLE_PUSHBUTTON, + ROLE_RADIOBUTTON, ROLE_SCROLLBAR, ROLE_SEPARATOR, ROLE_STATICTEXT, diff --git a/views/accessibility/view_accessibility.cc b/views/accessibility/view_accessibility.cc index 3613d99..179c9f6 100644 --- a/views/accessibility/view_accessibility.cc +++ b/views/accessibility/view_accessibility.cc @@ -292,7 +292,8 @@ STDMETHODIMP ViewAccessibility::get_accChild(VARIANT var_child, child_view = view_->GetChildViewAt(var_child.lVal - 1); // Parents handle leaf IAccessible's. - if (child_view && child_view->GetChildViewCount() == 0) + if (child_view && child_view->GetChildViewCount() == 0 && + !child_view->child_widget()) return S_FALSE; } else { // Child is located elsewhere in this view's subtree. @@ -826,6 +827,8 @@ int32 ViewAccessibility::MSAARole(AccessibilityTypes::Role role) { return ROLE_SYSTEM_PROGRESSBAR; case AccessibilityTypes::ROLE_PUSHBUTTON: return ROLE_SYSTEM_PUSHBUTTON; + case AccessibilityTypes::ROLE_RADIOBUTTON: + return ROLE_SYSTEM_RADIOBUTTON; case AccessibilityTypes::ROLE_SCROLLBAR: return ROLE_SYSTEM_SCROLLBAR; case AccessibilityTypes::ROLE_SEPARATOR: |