Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(382)

Unified Diff: ash/wm/activation_controller.cc

Issue 9264002: aura: Add Ctrl-Shift-Q for quit and Ctrl-Shift-L for lock in chromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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();

Powered by Google App Engine
This is Rietveld 408576698