Chromium Code Reviews| Index: ui/views/widget/widget.cc |
| diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc |
| index 08578add8f534fe637481183fd005dbc34a58a1c..8bba4c5f390d6217fc9ec9c0e0aee45e0f112bfe 100644 |
| --- a/ui/views/widget/widget.cc |
| +++ b/ui/views/widget/widget.cc |
| @@ -1312,8 +1312,13 @@ bool Widget::SetInitialFocus(ui::WindowShowState show_state) { |
| focus_manager_->SetStoredFocusView(v); |
| return true; |
| } |
| - if (v) |
| + if (v) { |
| v->RequestFocus(); |
|
tapted
2017/01/04 03:59:38
This is a bit inconsistent. View::RequestFocus() u
Patti Lor
2017/01/06 06:15:09
Done.
|
| + // If the request for focus was unsuccessful, fall back to using the first |
| + // focusable View instead. |
| + if (focus_manager_ && v != focus_manager_->GetFocusedView()) |
|
tapted
2017/01/04 03:59:38
Is it enough just to call focus_manager->AdvanceFo
Patti Lor
2017/01/06 06:15:09
No - AdvanceFocusIfNecessary is only meant to make
|
| + focus_manager_->AdvanceFocus(false); |
| + } |
| return !!v; |
| } |