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

Unified Diff: ui/aura_shell/stacking_controller.cc

Issue 8574033: Beginnings of Window Modality support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' 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
Index: ui/aura_shell/stacking_controller.cc
===================================================================
--- ui/aura_shell/stacking_controller.cc (revision 110305)
+++ ui/aura_shell/stacking_controller.cc (working copy)
@@ -21,7 +21,8 @@
// Returns true if children of |window| can be activated.
bool SupportsChildActivation(aura::Window* window) {
return window->id() == kShellWindowId_DefaultContainer ||
- window->id() == kShellWindowId_AlwaysOnTopContainer;
+ window->id() == kShellWindowId_AlwaysOnTopContainer ||
+ window->id() == kShellWindowId_TransientContainer;
}
} // namespace
@@ -68,6 +69,10 @@
switch (window->type()) {
case aura::WINDOW_TYPE_NORMAL:
case aura::WINDOW_TYPE_POPUP:
+ if (window->transient_parent()) {
+ parent = GetContainer(internal::kShellWindowId_TransientContainer);
+ break;
+ }
parent = always_on_top_controller_->GetContainer(window);
break;
case aura::WINDOW_TYPE_MENU:

Powered by Google App Engine
This is Rietveld 408576698