diff options
| author | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-25 06:11:52 +0000 |
|---|---|---|
| committer | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-25 06:11:52 +0000 |
| commit | d5eefc53ab6313688e473618fda1750f3457c7ec (patch) | |
| tree | 6cc6080b6871b7323b5017a46803a01362991bbc /ash/wm | |
| parent | 510ea77c92ad9b9c8b897b412254ccdede2b635f (diff) | |
| download | chromium_src-d5eefc53ab6313688e473618fda1750f3457c7ec.zip chromium_src-d5eefc53ab6313688e473618fda1750f3457c7ec.tar.gz chromium_src-d5eefc53ab6313688e473618fda1750f3457c7ec.tar.bz2 | |
Allow activation of the Launcher container
R=sky@chromium.org
BUG=104192
TEST=None
Review URL: http://codereview.chromium.org/9117021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119021 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm')
| -rw-r--r-- | ash/wm/activation_controller.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ash/wm/activation_controller.cc b/ash/wm/activation_controller.cc index 4ebaa91..8f4e801 100644 --- a/ash/wm/activation_controller.cc +++ b/ash/wm/activation_controller.cc @@ -32,6 +32,7 @@ bool SupportsChildActivation(aura::Window* window) { window->id() == kShellWindowId_PanelContainer || window->id() == kShellWindowId_SystemModalContainer || window->id() == kShellWindowId_StatusContainer || + window->id() == kShellWindowId_LauncherContainer || window->id() == kShellWindowId_LockScreenContainer || window->id() == kShellWindowId_LockSystemModalContainer; } |