diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-12 22:36:00 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-12 22:36:00 +0000 |
| commit | 067d7fe616a07011b9e2d2609fc65af8db6a7dfb (patch) | |
| tree | c8692eee33741154a163ceeb3b90de02c88abb80 /ash/wm/stacking_controller.cc | |
| parent | 436e8909ac51166cebfb03292a5bc05536d5b834 (diff) | |
| download | chromium_src-067d7fe616a07011b9e2d2609fc65af8db6a7dfb.zip chromium_src-067d7fe616a07011b9e2d2609fc65af8db6a7dfb.tar.gz chromium_src-067d7fe616a07011b9e2d2609fc65af8db6a7dfb.tar.bz2 | |
Move wm/core to wm namespace.
Also sets up new targets for wm_core, wm_core_unittests, etc.
R=sky@chromium.org
TBR=sky@chromium.org
BUG=
Review URL: https://codereview.chromium.org/196063002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256680 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/stacking_controller.cc')
| -rw-r--r-- | ash/wm/stacking_controller.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ash/wm/stacking_controller.cc b/ash/wm/stacking_controller.cc index b99f832..62263d4 100644 --- a/ash/wm/stacking_controller.cc +++ b/ash/wm/stacking_controller.cc @@ -39,8 +39,8 @@ bool IsSystemModal(aura::Window* window) { } bool HasTransientParentWindow(const aura::Window* window) { - return views::corewm::GetTransientParent(window) && - views::corewm::GetTransientParent(window)->type() != + return ::wm::GetTransientParent(window) && + ::wm::GetTransientParent(window)->type() != ui::wm::WINDOW_TYPE_UNKNOWN; } @@ -68,7 +68,7 @@ aura::Window* StackingController::GetDefaultParent(aura::Window* context, aura::Window* window, const gfx::Rect& bounds) { aura::Window* target_root = NULL; - aura::Window* transient_parent = views::corewm::GetTransientParent(window); + aura::Window* transient_parent = ::wm::GetTransientParent(window); if (transient_parent) { // Transient window should use the same root as its transient parent. target_root = transient_parent->GetRootWindow(); @@ -83,7 +83,7 @@ aura::Window* StackingController::GetDefaultParent(aura::Window* context, return GetSystemModalContainer(target_root, window); else if (HasTransientParentWindow(window)) return internal::RootWindowController::GetContainerForWindow( - views::corewm::GetTransientParent(window)); + ::wm::GetTransientParent(window)); return GetAlwaysOnTopController(target_root)->GetContainer(window); case ui::wm::WINDOW_TYPE_CONTROL: return GetContainerById( @@ -123,7 +123,7 @@ aura::Window* StackingController::GetSystemModalContainer( SessionStateDelegate* session_state_delegate = Shell::GetInstance()->session_state_delegate(); if (!session_state_delegate->IsUserSessionBlocked() || - !views::corewm::GetTransientParent(window)) { + !::wm::GetTransientParent(window)) { return GetContainerById(root, internal::kShellWindowId_SystemModalContainer); } @@ -131,7 +131,7 @@ aura::Window* StackingController::GetSystemModalContainer( // Otherwise those that originate from LockScreen container and above are // placed in the screen lock modal container. int window_container_id = - views::corewm::GetTransientParent(window)->parent()->id(); + ::wm::GetTransientParent(window)->parent()->id(); aura::Window* container = NULL; if (window_container_id < internal::kShellWindowId_LockScreenContainer) { container = GetContainerById( |