| Index: ash/wm/overview/scoped_transform_overview_window.cc
|
| diff --git a/ash/wm/overview/scoped_transform_overview_window.cc b/ash/wm/overview/scoped_transform_overview_window.cc
|
| index 19bbcb5ccd63770543f45f7a2824f85b2e17d65e..bf7cff94c1c57aeacb2d9e448dca2c32f0b92d1c 100644
|
| --- a/ash/wm/overview/scoped_transform_overview_window.cc
|
| +++ b/ash/wm/overview/scoped_transform_overview_window.cc
|
| @@ -65,7 +65,7 @@ void SetTransformOnWindowAndAllTransientChildren(
|
| SetTransformOnWindow(window, transform, animate);
|
|
|
| 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;
|
| @@ -80,7 +80,7 @@ void SetTransformOnWindowAndAllTransientChildren(
|
|
|
| aura::Window* GetModalTransientParent(aura::Window* window) {
|
| if (window->GetProperty(aura::client::kModalKey) == ui::MODAL_TYPE_WINDOW)
|
| - return views::corewm::GetTransientParent(window);
|
| + return ::wm::GetTransientParent(window);
|
| return NULL;
|
| }
|
|
|
| @@ -239,8 +239,8 @@ void ScopedTransformOverviewWindow::SetTransformOnWindowAndTransientChildren(
|
| bool animate) {
|
| gfx::Point origin(GetBoundsInScreen().origin());
|
| aura::Window* window = window_;
|
| - while (views::corewm::GetTransientParent(window))
|
| - window = views::corewm::GetTransientParent(window);
|
| + while (::wm::GetTransientParent(window))
|
| + window = ::wm::GetTransientParent(window);
|
| for (ScopedVector<ScopedWindowCopy>::const_iterator iter =
|
| window_copies_.begin(); iter != window_copies_.end(); ++iter) {
|
| SetTransformOnWindow(
|
|
|