| Index: ui/views/focus/focus_search.cc
|
| diff --git a/ui/views/focus/focus_search.cc b/ui/views/focus/focus_search.cc
|
| index a7ede3b0bf3d044666fbcdb9df23a3d45017f57b..ee0a7a80d74a251cbb9ccdf6c8e169235cd3ae68 100644
|
| --- a/ui/views/focus/focus_search.cc
|
| +++ b/ui/views/focus/focus_search.cc
|
| @@ -6,6 +6,7 @@
|
| #include "ui/views/focus/focus_manager.h"
|
| #include "ui/views/focus/focus_search.h"
|
| #include "ui/views/view.h"
|
| +#include "ui/views/widget/widget.h"
|
|
|
| namespace views {
|
|
|
| @@ -99,7 +100,8 @@ bool FocusSearch::IsViewFocusableCandidate(View* v, int skip_group_id) {
|
| }
|
|
|
| bool FocusSearch::IsFocusable(View* v) {
|
| - if (accessibility_mode_)
|
| + if (accessibility_mode_ ||
|
| + root_->GetWidget()->GetFocusManager()->IsKeyboardAccessibilityEnabled())
|
| return v && v->IsAccessibilityFocusable();
|
| return v && v->IsFocusable();
|
| }
|
|
|