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

Unified Diff: ash/wm/window_util.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: ash/wm/window_util.cc
diff --git a/ash/wm/window_util.cc b/ash/wm/window_util.cc
index def4b6d5bad254d0464152f51db0a6e0c6d31d3f..b849d0bf65caf4c444f56f813cad4496701a5f90 100644
--- a/ash/wm/window_util.cc
+++ b/ash/wm/window_util.cc
@@ -18,6 +18,7 @@
#include "ui/gfx/display.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/screen.h"
+#include "ui/views/corewm/transient_window_manager.h"
#include "ui/views/corewm/window_util.h"
#include "ui/views/view.h"
#include "ui/views/widget/widget.h"
@@ -134,10 +135,13 @@ void ReparentChildWithTransientChildren(aura::Window* child,
void ReparentTransientChildrenOfChild(aura::Window* child,
aura::Window* old_parent,
aura::Window* new_parent) {
- for (size_t i = 0; i < child->transient_children().size(); ++i) {
- ReparentChildWithTransientChildren(child->transient_children()[i],
- old_parent,
- new_parent);
+ for (size_t i = 0;
+ i < views::corewm::GetTransientChildren(child).size();
+ ++i) {
+ ReparentChildWithTransientChildren(
+ views::corewm::GetTransientChildren(child)[i],
+ old_parent,
+ new_parent);
}
}

Powered by Google App Engine
This is Rietveld 408576698