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

Unified Diff: ui/views/corewm/focus_controller.cc

Issue 115453004: Moves management of transients out of Window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix MRUWindowTracker and MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest Created 7 years 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/views/corewm/focus_controller.cc
diff --git a/ui/views/corewm/focus_controller.cc b/ui/views/corewm/focus_controller.cc
index 8c05ac26f324454016ad66d05224304424f5c2c8..c92428a735ad87a37c8178829a8363d6bc989e1c 100644
--- a/ui/views/corewm/focus_controller.cc
+++ b/ui/views/corewm/focus_controller.cc
@@ -12,6 +12,7 @@
#include "ui/aura/env.h"
#include "ui/events/event.h"
#include "ui/views/corewm/focus_rules.h"
+#include "ui/views/corewm/transient_window_manager.h"
namespace views {
namespace corewm {
@@ -24,10 +25,10 @@ void StackTransientParentsBelowModalWindow(aura::Window* window) {
if (window->GetProperty(aura::client::kModalKey) != ui::MODAL_TYPE_WINDOW)
return;
- aura::Window* transient_parent = window->transient_parent();
+ aura::Window* transient_parent = views::corewm::GetTransientParent(window);
while (transient_parent) {
transient_parent->parent()->StackChildAtTop(transient_parent);
- transient_parent = transient_parent->transient_parent();
+ transient_parent = views::corewm::GetTransientParent(transient_parent);
}
}
@@ -36,7 +37,7 @@ void StackWindowLayerAbove(aura::Window* window, aura::Window* relative_to) {
// Stack |window| above the last transient child of |relative_to| that shares
// the same parent.
const aura::Window::Windows& window_transients(
- relative_to->transient_children());
+ GetTransientChildren(relative_to));
for (aura::Window::Windows::const_iterator i = window_transients.begin();
i != window_transients.end(); ++i) {
aura::Window* transient = *i;

Powered by Google App Engine
This is Rietveld 408576698