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

Side by Side Diff: ash/common/wm/window_parenting_utils.cc

Issue 2737213002: Update window_parenting_utils to use aura::window (Closed)
Patch Set: address comments Created 3 years, 9 months 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/common/wm/window_parenting_utils.h" 5 #include "ash/common/wm/window_parenting_utils.h"
6 6
7 #include "ash/common/wm_window.h" 7 #include "ui/aura/window.h"
8 #include "ui/wm/core/window_util.h"
9
10 using aura::Window;
8 11
9 namespace ash { 12 namespace ash {
10 namespace wm { 13 namespace wm {
11 14
12 void ReparentChildWithTransientChildren(WmWindow* child, 15 void ReparentChildWithTransientChildren(Window* child,
13 WmWindow* old_parent, 16 Window* old_parent,
14 WmWindow* new_parent) { 17 Window* new_parent) {
15 if (child->GetParent() == old_parent) 18 if (child->parent() == old_parent)
16 new_parent->AddChild(child); 19 new_parent->AddChild(child);
17 ReparentTransientChildrenOfChild(child, old_parent, new_parent); 20 ReparentTransientChildrenOfChild(child, old_parent, new_parent);
18 } 21 }
19 22
20 void ReparentTransientChildrenOfChild(WmWindow* child, 23 void ReparentTransientChildrenOfChild(Window* child,
21 WmWindow* old_parent, 24 Window* old_parent,
22 WmWindow* new_parent) { 25 Window* new_parent) {
23 for (WmWindow* transient_child : child->GetTransientChildren()) 26 for (Window* transient_child : ::wm::GetTransientChildren(child))
24 ReparentChildWithTransientChildren(transient_child, old_parent, new_parent); 27 ReparentChildWithTransientChildren(transient_child, old_parent, new_parent);
25 } 28 }
26 29
27 } // namespace wm 30 } // namespace wm
28 } // namespace ash 31 } // namespace ash
OLDNEW
« ash/common/wm/panels/panel_window_resizer.cc ('K') | « ash/common/wm/window_parenting_utils.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698