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 bd6b0dc19fe4749a958afe41f8c49dd158ed446a..241acac8557273f6c2d724423072c17576be67d1 100644 |
| --- a/ui/views/focus/focus_manager.cc |
| +++ b/ui/views/focus/focus_manager.cc |
| @@ -517,7 +517,7 @@ void FocusManager::ViewRemoved(View* removed) { |
| // clear the focus. However, it's not safe to call ClearFocus() |
| // (and in turn ClearNativeFocus()) here because ViewRemoved() can |
| // be called while the top level widget is being destroyed. |
| - if (focused_view_ && removed->Contains(focused_view_)) |
| + if (focused_view_ && removed && removed->Contains(focused_view_)) |
|
sky
2016/06/06 16:30:45
This code shouldn't have to check for a null suppl
|
| SetFocusedView(NULL); |
| } |