summaryrefslogtreecommitdiffstats
path: root/athena/main
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-24 11:09:12 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-24 11:09:12 +0000
commit1b9697d6c8789ab555e5fc76ae90937fd8a248d5 (patch)
tree181e4ee5cb5745cd483c8989021622fcd887b610 /athena/main
parent3fdee23063ccc0f35d8562ed32f09a3f69d6a184 (diff)
downloadchromium_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/main')
-rw-r--r--athena/main/debug/debug_window.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/athena/main/debug/debug_window.cc b/athena/main/debug/debug_window.cc
index e495418..abd3517be 100644
--- a/athena/main/debug/debug_window.cc
+++ b/athena/main/debug/debug_window.cc
@@ -4,6 +4,7 @@
#include "athena/main/debug/debug_window.h"
+#include "athena/common/container_priorities.h"
#include "athena/resources/athena_resources.h"
#include "athena/screen/public/screen_manager.h"
#include "base/bind.h"
@@ -168,7 +169,8 @@ class DebugWidget {
private:
void CreateContainer() {
- athena::ScreenManager::ContainerParams params("DebugContainer");
+ athena::ScreenManager::ContainerParams params("DebugContainer",
+ athena::CP_DEBUG);
container_ = athena::ScreenManager::Get()->CreateContainer(params);
}