Rename StackingClient -> WindowTreeClient

ash/wm/panels/panel_window_resizer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/panels/panel_window_resizer.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/launcher/launcher.h"
 #include "ash/screen_ash.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "ash/wm/panels/panel_layout_manager.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/aura/client/aura_constants.h"
+#include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
@@ skipping 158 matching lines @@
   // Tell the panel layout manager that we are dragging this panel before
   // attaching it so that it does not get repositioned.
   if (panel_container_)
     GetPanelLayoutManager(panel_container_)->StartDragging(GetTarget());
   if (!was_attached_) {
     // Attach the panel while dragging placing it in front of other panels.
     wm::GetWindowState(GetTarget())->set_continue_drag_after_reparent(true);
     wm::GetWindowState(GetTarget())->set_panel_attached(true);
     // We use root window coordinates to ensure that during the drag the panel
     // is reparented to a container in the root window that has that window.
-    GetTarget()->SetDefaultParentByRootWindow(
-        GetTarget()->GetRootWindow(),
-        GetTarget()->GetRootWindow()->GetBoundsInScreen());
-    wm::ReparentTransientChildrenOfChild(GetTarget()->parent(), GetTarget());
+    aura::Window* target = GetTarget();
+    aura::RootWindow* target_root = target->GetRootWindow();
+    aura::client::ParentWindowWithContext(
+        target, target_root, target_root->GetBoundsInScreen());
+    wm::ReparentTransientChildrenOfChild(target->parent(), target);
   }
 }
 
 void PanelWindowResizer::FinishDragging() {
   if (!did_move_or_resize_)
     return;
   if (wm::GetWindowState(GetTarget())->panel_attached() != should_attach_) {
     wm::GetWindowState(GetTarget())->set_panel_attached(should_attach_);
     // We use last known location to ensure that after the drag the panel
     // is reparented to a container in the root window that has that location.
-    GetTarget()->SetDefaultParentByRootWindow(
-        GetTarget()->GetRootWindow(),
-        gfx::Rect(last_location_, gfx::Size()));
-    wm::ReparentTransientChildrenOfChild(GetTarget()->parent(), GetTarget());
+    aura::Window* target = GetTarget();
+    aura::RootWindow* target_root = target->GetRootWindow();
+    aura::client::ParentWindowWithContext(
+        target, target_root, gfx::Rect(last_location_, gfx::Size()));
+    wm::ReparentTransientChildrenOfChild(target->parent(), GetTarget());
   }
 
   // If we started the drag in one root window and moved into another root
   // but then canceled the drag we may need to inform the original layout
   // manager that the drag is finished.
   if (initial_panel_container_ != panel_container_)
      GetPanelLayoutManager(initial_panel_container_)->FinishDragging();
   if (panel_container_)
     GetPanelLayoutManager(panel_container_)->FinishDragging();
 }
 
 void PanelWindowResizer::UpdateLauncherPosition() {
   if (panel_container_) {
     GetPanelLayoutManager(panel_container_)->launcher()->
         UpdateIconPositionForWindow(GetTarget());
   }
 }
 
 }  // namespace aura