Index: ash/root_window_controller.cc |
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc |
index 5bcee4d061ff6ac94bb5db5e037c2624dacb9357..2b968735e289c5a342364a901978e9be111534e2 100644 |
--- a/ash/root_window_controller.cc |
+++ b/ash/root_window_controller.cc |
@@ -249,7 +249,7 @@ void RootWindowController::CreateContainersInRootWindow( |
// 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 |
@@ -269,6 +269,12 @@ void RootWindowController::CreateContainersInRootWindow( |
"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
Nikita (slow)
2012/09/28 20:55:31
I haven't noticed any in my testing. What specific
Nikita (slow)
2012/10/01 14:58:57
In fact it did. What I've changed was:
* backgrou
|
+ 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,
Nikita (slow)
2012/10/01 14:58:57
Due to stacking issues I had to leave root_window_
|
+ |
aura::Window* lock_background_containers = CreateContainer( |
internal::kShellWindowId_LockScreenBackgroundContainer, |
"LockScreenBackgroundContainer", |
@@ -314,12 +320,6 @@ void RootWindowController::CreateContainersInRootWindow( |
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); |