| Index: ash/wm/activation_controller.cc
|
| diff --git a/ash/wm/activation_controller.cc b/ash/wm/activation_controller.cc
|
| index 85d1c4f33365b324c54b5dadf4b498cd11004a9b..95f5f7c3235efeeb3af23da81f4b79cbbf491b67 100644
|
| --- a/ash/wm/activation_controller.cc
|
| +++ b/ash/wm/activation_controller.cc
|
| @@ -207,6 +207,8 @@ aura::Window* ActivationController::GetTopmostWindowToActivate(
|
| const aura::Window* container =
|
| default_container_for_test_ ? default_container_for_test_ :
|
| GetContainer(kShellWindowId_DefaultContainer);
|
| + if (!container)
|
| + return NULL;
|
| for (aura::Window::Windows::const_reverse_iterator i =
|
| container->children().rbegin();
|
| i != container->children().rend();
|
|
|