| Index: ash/wm/stacking_controller.cc
|
| diff --git a/ash/wm/stacking_controller.cc b/ash/wm/stacking_controller.cc
|
| index 723265d0dd13012175f31cab1440c55fd43c10fb..47f3d50c30985c326f18cfd5a6a53bedabbe1a8a 100644
|
| --- a/ash/wm/stacking_controller.cc
|
| +++ b/ash/wm/stacking_controller.cc
|
| @@ -19,11 +19,10 @@ StackingController::~StackingController() {}
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // StackingController, aura::client::WindowParentingClient implementation:
|
|
|
| -aura::Window* StackingController::GetDefaultParent(aura::Window* context,
|
| - aura::Window* window,
|
| +aura::Window* StackingController::GetDefaultParent(aura::Window* window,
|
| const gfx::Rect& bounds) {
|
| - return WmWindow::GetAuraWindow(wm::GetDefaultParent(
|
| - WmWindow::Get(context), WmWindow::Get(window), bounds));
|
| + return WmWindow::GetAuraWindow(
|
| + wm::GetDefaultParent(WmWindow::Get(window), bounds));
|
| }
|
|
|
| } // namespace ash
|
|
|