Chromium Code Reviews| Index: ui/views/window/client_view.cc |
| diff --git a/ui/views/window/client_view.cc b/ui/views/window/client_view.cc |
| index fb7d89fed1823b670feb600d00685f1e83f4526a..ed690b407002aee6cdcb677efe8381bd02ddfb6f 100644 |
| --- a/ui/views/window/client_view.cc |
| +++ b/ui/views/window/client_view.cc |
| @@ -92,7 +92,8 @@ void ClientView::ViewHierarchyChanged( |
| // Insert |contents_view_| at index 0 so it is first in the focus chain. |
| // (the OK/Cancel buttons are inserted before contents_view_) |
| AddChildViewAt(contents_view_, 0); |
| - } |
| + } else if (!details.is_add && details.child == contents_view_) |
|
sky
2016/02/22 16:38:57
nit {} (because this an else block of a conditiona
karandeepb
2016/02/22 23:40:37
Done.
|
| + contents_view_ = nullptr; |
| } |
| } // namespace views |