From d8f1004bcf08a2c0d629198a3695808b3a400487 Mon Sep 17 00:00:00 2001 From: "scottmg@chromium.org" Date: Wed, 14 Nov 2012 01:10:46 +0000 Subject: re-re-land of https://codereview.chromium.org/11364053/ First attempt here: https://codereview.chromium.org/11364053/ : failed linux_chromeos_asan Second attempt here: http://codereview.chromium.org/11362216/ : collided with renames in http://crrev.com/167418 This cl is the same as the second attempt, with the namespaces and includes updated for file renames. TBR=ben@chromium.org BUG=128578 Review URL: https://chromiumcodereview.appspot.com/11377140 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167547 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/wm/stacking_controller.cc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'ash/wm/stacking_controller.cc') diff --git a/ash/wm/stacking_controller.cc b/ash/wm/stacking_controller.cc index c2f6545..a9df31d 100644 --- a/ash/wm/stacking_controller.cc +++ b/ash/wm/stacking_controller.cc @@ -17,7 +17,6 @@ #include "ui/base/ui_base_types.h" namespace ash { -namespace internal { namespace { // Find a root window that matches the |bounds|. If the virtual screen @@ -56,7 +55,6 @@ bool IsWindowModal(aura::Window* window) { // StackingController, public: StackingController::StackingController() { - aura::client::SetStackingClient(this); } StackingController::~StackingController() { @@ -65,7 +63,8 @@ StackingController::~StackingController() { //////////////////////////////////////////////////////////////////////////////// // StackingController, aura::StackingClient implementation: -aura::Window* StackingController::GetDefaultParent(aura::Window* window, +aura::Window* StackingController::GetDefaultParent(aura::Window* context, + aura::Window* window, const gfx::Rect& bounds) { aura::RootWindow* target_root = NULL; if (window->transient_parent()) { @@ -149,10 +148,9 @@ StackingController::GetAlwaysOnTopController(aura::RootWindow* root_window) { root_window->GetChildById( internal::kShellWindowId_AlwaysOnTopContainer)); // RootWindow owns the AlwaysOnTopController object. - root_window->SetProperty(kAlwaysOnTopControllerKey, controller); + root_window->SetProperty(internal::kAlwaysOnTopControllerKey, controller); } return controller; } -} // namespace internal } // namespace ash -- cgit v1.1