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

Unified Diff: ash/common/wm/dock/docked_window_resizer.cc

Issue 2737213002: Update window_parenting_utils to use aura::window (Closed)
Patch Set: fix 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 side-by-side diff with in-line comments
Download patch
Index: ash/common/wm/dock/docked_window_resizer.cc
diff --git a/ash/common/wm/dock/docked_window_resizer.cc b/ash/common/wm/dock/docked_window_resizer.cc
index f2ea238d33dc9ccd9be4789d6c6a8374a2bab216..7b21be99c9c92a10aa69d95a0dd766ce6dd114a7 100644
--- a/ash/common/wm/dock/docked_window_resizer.cc
+++ b/ash/common/wm/dock/docked_window_resizer.cc
@@ -189,7 +189,8 @@ void DockedWindowResizer::StartedDragging(
GetTarget()->GetRootWindow()->GetChildByShellWindowId(
kShellWindowId_DockedContainer);
wm::ReparentChildWithTransientChildren(
- GetTarget(), GetTarget()->GetParent(), docked_container);
+ GetTarget()->aura_window(), GetTarget()->GetParent()->aura_window(),
+ docked_container->aura_window());
if (!resizer)
return;
}
@@ -266,8 +267,9 @@ DockedAction DockedWindowResizer::MaybeReparentWindowOnDragCompletion(
if ((is_resized || !is_attached_panel) &&
is_docked_ != (window->GetParent() == dock_container)) {
if (is_docked_) {
- wm::ReparentChildWithTransientChildren(window, window->GetParent(),
- dock_container);
+ wm::ReparentChildWithTransientChildren(window->aura_window(),
+ window->GetParent()->aura_window(),
+ dock_container->aura_window());
action = DOCKED_ACTION_DOCK;
} else if (window->GetParent()->GetShellWindowId() ==
kShellWindowId_DockedContainer) {
@@ -282,8 +284,9 @@ DockedAction DockedWindowResizer::MaybeReparentWindowOnDragCompletion(
WmWindow* previous_parent = window->GetParent();
window->SetParentUsingContext(window, near_last_location);
if (window->GetParent() != previous_parent) {
- wm::ReparentTransientChildrenOfChild(window, previous_parent,
- window->GetParent());
+ wm::ReparentTransientChildrenOfChild(
+ window->aura_window(), previous_parent->aura_window(),
+ window->GetParent()->aura_window());
}
action = was_docked_ ? DOCKED_ACTION_UNDOCK : DOCKED_ACTION_NONE;
}

Powered by Google App Engine
This is Rietveld 408576698