| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/wm/stacking_controller.h" | 5 #include "ash/wm/stacking_controller.h" |
| 6 | 6 |
| 7 #include "ash/wm/container_finder.h" | 7 #include "ash/wm/container_finder.h" |
| 8 #include "ash/wm_window.h" | 8 #include "ui/aura/window.h" |
| 9 | 9 |
| 10 namespace ash { | 10 namespace ash { |
| 11 | 11 |
| 12 //////////////////////////////////////////////////////////////////////////////// | 12 //////////////////////////////////////////////////////////////////////////////// |
| 13 // StackingController, public: | 13 // StackingController, public: |
| 14 | 14 |
| 15 StackingController::StackingController() {} | 15 StackingController::StackingController() {} |
| 16 | 16 |
| 17 StackingController::~StackingController() {} | 17 StackingController::~StackingController() {} |
| 18 | 18 |
| 19 //////////////////////////////////////////////////////////////////////////////// | 19 //////////////////////////////////////////////////////////////////////////////// |
| 20 // StackingController, aura::client::WindowParentingClient implementation: | 20 // StackingController, aura::client::WindowParentingClient implementation: |
| 21 | 21 |
| 22 aura::Window* StackingController::GetDefaultParent(aura::Window* window, | 22 aura::Window* StackingController::GetDefaultParent(aura::Window* window, |
| 23 const gfx::Rect& bounds) { | 23 const gfx::Rect& bounds) { |
| 24 return WmWindow::GetAuraWindow( | 24 return wm::GetDefaultParent(window, bounds); |
| 25 wm::GetDefaultParent(WmWindow::Get(window), bounds)); | |
| 26 } | 25 } |
| 27 | 26 |
| 28 } // namespace ash | 27 } // namespace ash |
| OLD | NEW |