diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 01:10:46 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 01:10:46 +0000 |
| commit | d8f1004bcf08a2c0d629198a3695808b3a400487 (patch) | |
| tree | 77d0c11dfba7586a6a85347cabb2c3e83d8735ce /ash/wm/stacking_controller.cc | |
| parent | e32934786cf3edc23e2055c7f898d1ef77eced59 (diff) | |
| download | chromium_src-d8f1004bcf08a2c0d629198a3695808b3a400487.zip chromium_src-d8f1004bcf08a2c0d629198a3695808b3a400487.tar.gz chromium_src-d8f1004bcf08a2c0d629198a3695808b3a400487.tar.bz2 | |
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
Diffstat (limited to 'ash/wm/stacking_controller.cc')
| -rw-r--r-- | ash/wm/stacking_controller.cc | 8 |
1 files changed, 3 insertions, 5 deletions
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 |