| Index: ui/views/focus/focus_manager.cc
|
| diff --git a/ui/views/focus/focus_manager.cc b/ui/views/focus/focus_manager.cc
|
| index 80a4dc8d6bdd0c7b67ee984e6081e434cebe6db1..82466781f62c877554a9e2d804594fb7f7387c59 100644
|
| --- a/ui/views/focus/focus_manager.cc
|
| +++ b/ui/views/focus/focus_manager.cc
|
| @@ -313,6 +313,18 @@ void FocusManager::SetFocusedViewWithReason(
|
| if (focused_view_ == view)
|
| return;
|
|
|
| +#if !defined(OS_MACOSX)
|
| + // TODO(warx): There are some AccessiblePaneViewTest failed on macosx.
|
| + // crbug.com/650859. Remove !defined(OS_MACOSX) once that is fixed.
|
| + //
|
| + // If |widget_| is not active, focus is not allowed to set within |widget_|
|
| + // right now, we just need to store this view.
|
| + if (view && !widget_->IsActive()) {
|
| + SetStoredFocusView(view);
|
| + return;
|
| + }
|
| +#endif
|
| +
|
| base::AutoReset<bool> auto_changing_focus(&is_changing_focus_, true);
|
| // Update the reason for the focus change (since this is checked by
|
| // some listeners), then notify all listeners.
|
|
|