summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authorxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-28 22:11:28 +0000
committerxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-28 22:11:28 +0000
commit366f17851e2e0928d8c276ea4f732ea0e656fde6 (patch)
treece7120ffa8e4eaf7ca68cc7913a7854287e4aca9 /ash
parent2d561fefe04e045483a99c4c0acc32d476002fa8 (diff)
downloadchromium_src-366f17851e2e0928d8c276ea4f732ea0e656fde6.zip
chromium_src-366f17851e2e0928d8c276ea4f732ea0e656fde6.tar.gz
chromium_src-366f17851e2e0928d8c276ea4f732ea0e656fde6.tar.bz2
ash: Make applist container behind launcher container.
BUG=120660 TEST=Verify launcher is clickable when applist is present per issue 120660. Review URL: http://codereview.chromium.org/9837117 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129497 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/shell.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/ash/shell.cc b/ash/shell.cc
index 3188cc2..2d1d8d4 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -172,14 +172,14 @@ void CreateSpecialContainers(aura::RootWindow* root_window) {
panel_container->SetLayoutManager(layout_manager);
}
- CreateContainer(internal::kShellWindowId_LauncherContainer,
- "LauncherContainer",
- non_lock_screen_containers);
-
CreateContainer(internal::kShellWindowId_AppListContainer,
"AppListContainer",
non_lock_screen_containers);
+ CreateContainer(internal::kShellWindowId_LauncherContainer,
+ "LauncherContainer",
+ non_lock_screen_containers);
+
aura::Window* modal_container = CreateContainer(
internal::kShellWindowId_SystemModalContainer,
"SystemModalContainer",