diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-27 18:38:53 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-27 18:38:53 +0000 |
| commit | dad302ac1eab451d22bc3e4fb58af687c55f3fc6 (patch) | |
| tree | d379222864c7c9611e8c3c7e0cc94c413c720378 /ui | |
| parent | 79e3a216ac463c472ea9839bb9eddc0c4c7c0ecb (diff) | |
| download | chromium_src-dad302ac1eab451d22bc3e4fb58af687c55f3fc6.zip chromium_src-dad302ac1eab451d22bc3e4fb58af687c55f3fc6.tar.gz chromium_src-dad302ac1eab451d22bc3e4fb58af687c55f3fc6.tar.bz2 | |
aura: Check for a non-null delegate. This fixes a crash when clicking after closing all windows.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8052012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102980 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/aura/event_filter.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/aura/event_filter.cc b/ui/aura/event_filter.cc index e7c362b..2ece9ab 100644 --- a/ui/aura/event_filter.cc +++ b/ui/aura/event_filter.cc @@ -47,7 +47,8 @@ void EventFilter::ActivateIfNecessary( // |window| is not in a top level window. return; } - if (!toplevel_window->delegate()->ShouldActivate(event)) + if (!toplevel_window->delegate() || + !toplevel_window->delegate()->ShouldActivate(event)) return; Desktop::GetInstance()->SetActiveWindow(toplevel_window, window); |