Chromium Code Reviews| 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..e44146c4ab77a6e401f9b0988aa626fc775d5e0b 100644 |
| --- a/ui/views/focus/focus_manager.cc |
| +++ b/ui/views/focus/focus_manager.cc |
| @@ -313,6 +313,19 @@ 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_| |
|
sky
2016/10/04 15:47:03
I think you want something like:
If the widget is
Qiang(Joe) Xu
2016/10/10 16:40:00
Done.
|
| + // right now, we just need to store this view. |
| + if (view && !widget_->IsActive()) { |
| + SetStoredFocusView(view); |
| + widget_->Activate(); |
| + 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. |