diff options
| author | oshima <oshima@chromium.org> | 2014-10-20 10:19:18 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-20 17:20:09 +0000 |
| commit | 44bf2fd5fb11d3777e522fae68de024c8f6ce46f (patch) | |
| tree | ee959cfe4065367147ab432ddd4b22a51f504004 /athena/util | |
| parent | 3f5d1eae967412133ff221d2aea6dd325b45928c (diff) | |
| download | chromium_src-44bf2fd5fb11d3777e522fae68de024c8f6ce46f.zip chromium_src-44bf2fd5fb11d3777e522fae68de024c8f6ce46f.tar.gz chromium_src-44bf2fd5fb11d3777e522fae68de024c8f6ce46f.tar.bz2 | |
Support modal windows
* New ContainerParams
- default_parent to specify the default parent when no
transient parent is specified.
- modal_container_priority now controls the modal container
used for a modal window created for the given container.
- if not specified, it will fallback downwards to find one.
- if window is specified as always_on_top, it will use top
most modal container.
* Changed network selector/shutdown dialog to use the new API.
* Other change:
Separated test windows to athena/test/base/test_windows.h
BUG=410499
TBR=sky@chromium.org,reed@chromium.org
TEST=coverd by unit tests
Committed: https://crrev.com/4903fd36b2b36f00efeb1b7bba81b7de6e9457a3
Cr-Commit-Position: refs/heads/master@{#300192}
Review URL: https://codereview.chromium.org/662763002
Cr-Commit-Position: refs/heads/master@{#300288}
Diffstat (limited to 'athena/util')
| -rw-r--r-- | athena/util/container_priorities.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/athena/util/container_priorities.h b/athena/util/container_priorities.h index 33b687d..8b30300 100644 --- a/athena/util/container_priorities.h +++ b/athena/util/container_priorities.h @@ -12,9 +12,11 @@ enum ContainerPriorities { CP_DEFAULT, CP_HOME_CARD, CP_SYSTEM_MODAL, + // TODO(oshima): rename LOGIN_xxx to something more generic. CP_LOGIN_SCREEN, CP_LOGIN_SCREEN_SYSTEM_MODAL, CP_VIRTUAL_KEYBOARD, + CP_END, }; } // namespace athena |