Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(360)

Unified Diff: ui/aura_shell/shell.cc

Issue 8638013: [cros Aura] Added modal container for screen lock. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: small fix Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/aura_shell/shell_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/shell.cc
diff --git a/ui/aura_shell/shell.cc b/ui/aura_shell/shell.cc
index 49e515ffa687b32e8f8ebdd365e1b82c4434cc6e..3e42cdcf65dca246bc21dfdd0418e186cb16d0a6 100644
--- a/ui/aura_shell/shell.cc
+++ b/ui/aura_shell/shell.cc
@@ -83,6 +83,14 @@ void CreateSpecialContainers(aura::Window::Windows* containers) {
lock_container->set_id(internal::kShellWindowId_LockScreenContainer);
containers->push_back(lock_container);
+ aura::Window* lock_modal_container = new aura::Window(NULL);
+ lock_modal_container->SetEventFilter(
+ new ToplevelWindowEventFilter(lock_modal_container));
+ lock_modal_container->SetLayoutManager(
+ new internal::ModalContainerLayoutManager(lock_modal_container));
+ lock_modal_container->set_id(internal::kShellWindowId_LockModalContainer);
+ containers->push_back(lock_modal_container);
+
aura::Window* status_container = new aura::Window(NULL);
status_container->set_id(internal::kShellWindowId_StatusContainer);
containers->push_back(status_container);
« no previous file with comments | « no previous file | ui/aura_shell/shell_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698