diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 15:31:49 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 15:31:49 +0000 |
| commit | 521c703f8d62fa698c3e88287c64d8d23f9ac675 (patch) | |
| tree | 2e50833697a511a3cbc1f589fc4e17d466b82f03 /ash/display | |
| parent | 46e49bdb2dcac1f906d01c8373e9fc3c8ce2186c (diff) | |
| download | chromium_src-521c703f8d62fa698c3e88287c64d8d23f9ac675.zip chromium_src-521c703f8d62fa698c3e88287c64d8d23f9ac675.tar.gz chromium_src-521c703f8d62fa698c3e88287c64d8d23f9ac675.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=
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=256680
Review URL: https://codereview.chromium.org/196063002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256839 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display')
| -rw-r--r-- | ash/display/screen_position_controller.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/display/screen_position_controller.cc b/ash/display/screen_position_controller.cc index e76fdc4..c0079c8 100644 --- a/ash/display/screen_position_controller.cc +++ b/ash/display/screen_position_controller.cc @@ -40,7 +40,7 @@ void MoveAllTransientChildrenToNewRoot(const gfx::Display& display, aura::Window* dst_root = Shell::GetInstance()->display_controller()-> GetRootWindowForDisplayId(display.id()); aura::Window::Windows transient_children = - views::corewm::GetTransientChildren(window); + ::wm::GetTransientChildren(window); for (aura::Window::Windows::iterator iter = transient_children.begin(); iter != transient_children.end(); ++iter) { aura::Window* transient_child = *iter; @@ -163,7 +163,7 @@ void ScreenPositionController::SetBounds(aura::Window* window, // b) if the window or its ancestor has kStayInSameRootWindowkey. It's // intentionally kept in the same root window even if the bounds is // outside of the display. - if (!views::corewm::GetTransientParent(window) && + if (!::wm::GetTransientParent(window) && !ShouldStayInSameRootWindow(window)) { aura::Window* dst_root = Shell::GetInstance()->display_controller()->GetRootWindowForDisplayId( |