Commit 34ff47da authored by James Wallace-Lee's avatar James Wallace-Lee Committed by Commit Bot

GetFocusedChildWidgetForAccessibility should return any focused widget

Modify ViewAccessibilityUtils::GetFocusedChildWidgetForAccessibility to
return any widget that is visible and focused.

Previously, this was limited to tab-modal dialogs. Other focused
widgets, like the Find bar, should be treated in the same way.

Bug: 869703
Change-Id: I720bdd1e9c8d665d839296aa9bfd4c9490805dbd
Reviewed-on: https://chromium-review.googlesource.com/1208810Reviewed-by: default avatarDominic Mazzoni <dmazzoni@chromium.org>
Commit-Queue: James Wallace-Lee <jamwalla@chromium.org>
Cr-Commit-Position: refs/heads/master@{#590523}
parent b915d1ef
...@@ -37,8 +37,7 @@ Widget* ViewAccessibilityUtils::GetFocusedChildWidgetForAccessibility( ...@@ -37,8 +37,7 @@ Widget* ViewAccessibilityUtils::GetFocusedChildWidgetForAccessibility(
// static // static
bool ViewAccessibilityUtils::IsFocusedChildWidget(Widget* widget, bool ViewAccessibilityUtils::IsFocusedChildWidget(Widget* widget,
const View* focused_view) { const View* focused_view) {
return widget->widget_delegate()->GetModalType() == ui::MODAL_TYPE_CHILD && return widget->IsVisible() &&
widget->IsVisible() &&
widget->GetContentsView()->Contains(focused_view); widget->GetContentsView()->Contains(focused_view);
}; };
......
...@@ -20,8 +20,7 @@ class VIEWS_EXPORT ViewAccessibilityUtils { ...@@ -20,8 +20,7 @@ class VIEWS_EXPORT ViewAccessibilityUtils {
static Widget* GetFocusedChildWidgetForAccessibility(const View* view); static Widget* GetFocusedChildWidgetForAccessibility(const View* view);
// Used by GetFocusedChildWidgetForAccessibility to determine if a Widget // Used by GetFocusedChildWidgetForAccessibility to determine if a Widget
// should be handled separately. When visible and focused, these include: // should be handled separately.
// - tab modal dialogs
static bool IsFocusedChildWidget(Widget* widget, const View* focused_view); static bool IsFocusedChildWidget(Widget* widget, const View* focused_view);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment