Fix crash when JS alert from background page appears during lock screen

ash/wm/stacking_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/stacking_controller.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 110 matching lines @@
   // all modal windows are placed into the normal modal container.
   if (!Shell::GetInstance()->session_state_delegate()->IsScreenLocked() &&
       Shell::GetInstance()->session_state_delegate()->
           IsActiveUserSessionStarted()) {
     return GetContainerById(root,
                             internal::kShellWindowId_SystemModalContainer);
   }
 
   // Otherwise those that originate from LockScreen container and above are
   // placed in the screen lock modal container.
-  aura::Window* lock_container =
-      GetContainerById(root, internal::kShellWindowId_LockScreenContainer);
-  int lock_container_id = lock_container->id();
-  int window_container_id = window->transient_parent()->parent()->id();
+
+  // Transient parent for window can be NULL for alerts from background pages
+  // assume that all such alerts belong to user session.
+  int window_container_id = window->transient_parent() ?

[sky, 2013/05/30 14:53:47]

This code would be less mysterious if you made it early out, eg:

if (!window->transient_parent())
  return GetContainerById(root, internal::kShellWindowId_SystemModalContainer);
}

In fact you could combine this with the if on 122 (keeping your comment).

[Dmitry Polukhin, 2013/05/30 15:09:02]

Done.

+      window->transient_parent()->parent()->id() :
+      internal::kShellWindowId_WorkspaceContainer;
 
   aura::Window* container = NULL;
-  if (window_container_id < lock_container_id) {
+  if (window_container_id < internal::kShellWindowId_LockScreenContainer) {
     container = GetContainerById(
         root, internal::kShellWindowId_SystemModalContainer);
   } else {
     container = GetContainerById(
         root, internal::kShellWindowId_LockSystemModalContainer);
   }
 
   return container;
 }
 
 // TODO(oshima): Remove this once extended desktop is on by default.
 internal::AlwaysOnTopController*
 StackingController::GetAlwaysOnTopController(aura::RootWindow* root_window) {
   internal::AlwaysOnTopController* controller =
       root_window->GetProperty(internal::kAlwaysOnTopControllerKey);
   if (!controller) {
     controller = new internal::AlwaysOnTopController;
     controller->SetAlwaysOnTopContainer(
         root_window->GetChildById(
             internal::kShellWindowId_AlwaysOnTopContainer));
     // RootWindow owns the AlwaysOnTopController object.
     root_window->SetProperty(internal::kAlwaysOnTopControllerKey, controller);
   }
   return controller;
 }
 
 }  // namespace ash