diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-24 11:09:12 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-24 11:09:12 +0000 |
| commit | 1b9697d6c8789ab555e5fc76ae90937fd8a248d5 (patch) | |
| tree | 181e4ee5cb5745cd483c8989021622fcd887b610 /athena/wm | |
| parent | 3fdee23063ccc0f35d8562ed32f09a3f69d6a184 (diff) | |
| download | chromium_src-1b9697d6c8789ab555e5fc76ae90937fd8a248d5.zip chromium_src-1b9697d6c8789ab555e5fc76ae90937fd8a248d5.tar.gz chromium_src-1b9697d6c8789ab555e5fc76ae90937fd8a248d5.tar.bz2 | |
Explicit container priority
* This will allow a client to create & destroy a container with specific z order, without relying on the order it is created. (will be used for login/lock screen)
* Changed to single click to open home card, instead of double click because it's easier and consistent with ash. (ash uses single click to open/activate things)
* I tried to add check but I couldn't come up with good solution using window oberver as the child is always added to the top first.
BUG=394121
Review URL: https://codereview.chromium.org/411543006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285185 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'athena/wm')
| -rw-r--r-- | athena/wm/window_manager_impl.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/athena/wm/window_manager_impl.cc b/athena/wm/window_manager_impl.cc index 7f659e1..4bb04501 100644 --- a/athena/wm/window_manager_impl.cc +++ b/athena/wm/window_manager_impl.cc @@ -4,6 +4,7 @@ #include "athena/wm/public/window_manager.h" +#include "athena/common/container_priorities.h" #include "athena/input/public/accelerator_manager.h" #include "athena/screen/public/screen_manager.h" #include "athena/wm/bezel_controller.h" @@ -86,7 +87,7 @@ class AthenaContainerLayoutManager : public aura::LayoutManager { class WindowManagerImpl* instance = NULL; WindowManagerImpl::WindowManagerImpl() { - ScreenManager::ContainerParams params("DefaultContainer"); + ScreenManager::ContainerParams params("DefaultContainer", CP_DEFAULT); params.can_activate_children = true; container_.reset(ScreenManager::Get()->CreateDefaultContainer(params)); container_->SetLayoutManager(new AthenaContainerLayoutManager); |