ash: Fix event processing in modal windows in login/lock screen.

ash/root_window_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/root_window_controller.h"
 
 #include <vector>
 
 #include "ash/desktop_background/desktop_background_widget_controller.h"
 #include "ash/display/display_controller.h"
 #include "ash/display/multi_display_manager.h"
 #include "ash/shell.h"
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.h"
+#include "ash/system/tray/system_tray_delegate.h"
 #include "ash/wm/base_layout_manager.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/root_window_layout_manager.h"
 #include "ash/wm/screen_dimmer.h"
 #include "ash/wm/system_modal_container_layout_manager.h"
 #include "ash/wm/toplevel_window_event_handler.h"
 #include "ash/wm/visibility_controller.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/workspace/colored_window_controller.h"
 #include "ash/wm/workspace_controller.h"
@@ skipping 137 matching lines @@
   screen_dimmer_.reset();
   workspace_controller_.reset();
   // Forget with the display ID so that display lookup
   // ends up with invalid display.
   root_window_->ClearProperty(kDisplayIdKey);
   // And this root window should no longer process events.
   root_window_->PrepareForShutdown();
 }
 
 SystemModalContainerLayoutManager*
-RootWindowController::GetSystemModalLayoutManager() {
+RootWindowController::GetSystemModalLayoutManager(aura::Window* window) {
+  aura::Window* container = NULL;
+  if (window) {
+    container = GetContainer(
+        kShellWindowId_LockSystemModalContainer);
+    if (!container->Contains(window))
+      container = GetContainer(kShellWindowId_SystemModalContainer);
+  } else {
+    user::LoginStatus login = Shell::GetInstance()->tray_delegate() ?
+      Shell::GetInstance()->tray_delegate()->GetUserLoginStatus() :

[sky, 2012/10/12 17:00:37]

nit: indent 4 for 182/183.
How come we have user login status on the TrayDelegate and similar type methods
on ShellDelegate? Can they be unified? It can be done separately though.

[sadrul, 2012/10/12 18:24:30]

Agree. Filed http://code.google.com/p/chromium/issues/detail?id=155573

+      user::LOGGED_IN_NONE;
+    int modal_window_id = (login == user::LOGGED_IN_LOCKED ||
+                           login == user::LOGGED_IN_NONE) ?
+        kShellWindowId_LockSystemModalContainer :
+        kShellWindowId_SystemModalContainer;
+    container = GetContainer(modal_window_id);
+  }
   return static_cast<SystemModalContainerLayoutManager*>(
-      GetContainer(kShellWindowId_SystemModalContainer)->layout_manager());
+      container->layout_manager());
 }
 
 aura::Window* RootWindowController::GetContainer(int container_id) {
   return root_window_->GetChildById(container_id);
 }
 
 void RootWindowController::InitLayoutManagers() {
   root_window_layout_ =
       new RootWindowLayoutManager(root_window_.get());
   root_window_->SetLayoutManager(root_window_layout_);
@@ skipping 239 matching lines @@
 
   aura::Window* overlay_container = CreateContainer(
       kShellWindowId_OverlayContainer,
       "OverlayContainer",
       lock_screen_related_containers);
   SetUsesScreenCoordinates(overlay_container);
 }
 
 }  // namespace internal
 }  // namespace ash