Polish lock animation - launcher should do a fade out.

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"
@@ skipping 231 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // RootWindowController, private:
 
 void RootWindowController::CreateContainersInRootWindow(
     aura::RootWindow* root_window) {
   // These containers are just used by PowerButtonController to animate groups
   // of containers simultaneously without messing up the current transformations
   // on those containers. These are direct children of the root window; all of
   // the other containers are their children.
-  // Desktop and lock screen background containers are not part of the
+  // Launcher, desktop and lock screen background containers are not part of the
   // lock animation so they are not included in those animate groups.
   // When screen is locked desktop background is moved to lock screen background
   // container (moved back on unlock). We want to make sure that there's an
   // opaque layer occluding the non-lock-screen layers.
 
   CreateContainer(internal::kShellWindowId_SystemBackgroundContainer,
                   "SystemBackgroundContainer", root_window);
 
   aura::Window* desktop_background_containers = CreateContainer(
       internal::kShellWindowId_DesktopBackgroundContainer,
       "DesktopBackgroundContainer",
       root_window);
   SetChildWindowVisibilityChangesAnimated(desktop_background_containers);
 
   aura::Window* non_lock_screen_containers = CreateContainer(
       internal::kShellWindowId_NonLockScreenContainersContainer,
       "NonLockScreenContainersContainer",
       root_window);
 
+  aura::Window* launcher_container = CreateContainer(

[Daniel Erat, 2012/09/28 20:48:48]

This is a pretty big stacking change, right?  Does this cause any problems?

[Nikita (slow), 2012/09/28 20:55:31]

I haven't noticed any in my testing. What specific test cases would need to be
checked?

However when I first left launcher_container defined where it was before (lines
317-321) but just changed its parent to root_window I've seen an issue that I
could not click tray when I was inside user session. Moving launcher container
definition here fixed that.

[Nikita (slow), 2012/10/01 14:58:57]

In fact it did. What I've changed was:

* background
* non_lock_screen_containers
  ** ...
  ** App List
  ** System modal windows
* Launcher

This introduced bug that app list and modal dialogs were placed below launcher.

+      internal::kShellWindowId_LauncherContainer,
+      "LauncherContainer",
+      root_window);
+  SetUsesScreenCoordinates(launcher_container);

[sky, 2012/09/28 23:20:28]

You should update the ids in shell_window_ids too, since that roughly matches
z-ordering. You also need to add a comment as to why the order needs to be the
way it is.

I also think this code would be made clearer if you added it after the last
thing is added to the non_lock_screen_containers since that's better matches
visually how all this fits together.

[Nikita (slow), 2012/10/01 14:58:57]

Due to stacking issues I had to leave root_window_controller.cc unchanged for
this fix.

+
   aura::Window* lock_background_containers = CreateContainer(
       internal::kShellWindowId_LockScreenBackgroundContainer,
       "LockScreenBackgroundContainer",
       root_window);
   SetChildWindowVisibilityChangesAnimated(lock_background_containers);
 
   aura::Window* lock_screen_containers = CreateContainer(
       internal::kShellWindowId_LockScreenContainersContainer,
       "LockScreenContainersContainer",
       root_window);
@@ skipping 25 matching lines @@
       new ToplevelWindowEventHandler(always_on_top_container));
   SetChildWindowVisibilityChangesAnimated(always_on_top_container);
   SetUsesScreenCoordinates(always_on_top_container);
 
   aura::Window* panel_container = CreateContainer(
       internal::kShellWindowId_PanelContainer,
       "PanelContainer",
       non_lock_screen_containers);
   SetUsesScreenCoordinates(panel_container);
 
-  aura::Window* launcher_container =
-      CreateContainer(internal::kShellWindowId_LauncherContainer,
-                      "LauncherContainer",
-                      non_lock_screen_containers);
-  SetUsesScreenCoordinates(launcher_container);
-
   CreateContainer(internal::kShellWindowId_AppListContainer,
                   "AppListContainer",
                   non_lock_screen_containers);
 
   aura::Window* modal_container = CreateContainer(
       internal::kShellWindowId_SystemModalContainer,
       "SystemModalContainer",
       non_lock_screen_containers);
   modal_container_handler_.reset(
       new ToplevelWindowEventHandler(modal_container));
@@ skipping 59 matching lines @@
 
   aura::Window* overlay_container = CreateContainer(
       internal::kShellWindowId_OverlayContainer,
       "OverlayContainer",
       lock_screen_related_containers);
   SetUsesScreenCoordinates(overlay_container);
 }
 
 }  // namespace internal
 }  // namespace ash