| Index: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
|
| diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
|
| index 154484f6d432d4944500a3fb699c84fac24a98f0..5a9ea72679a9ab5af30293f163433cb912941778 100644
|
| --- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
|
| +++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
|
| @@ -155,21 +155,21 @@ class AnimationSetter {
|
| AnimationSetter(aura::Window* window, int animation_time_in_ms)
|
| : window_(window),
|
| previous_animation_type_(
|
| - views::corewm::GetWindowVisibilityAnimationType(window_)),
|
| + wm::GetWindowVisibilityAnimationType(window_)),
|
| previous_animation_time_(
|
| - views::corewm::GetWindowVisibilityAnimationDuration(*window_)) {
|
| - views::corewm::SetWindowVisibilityAnimationType(
|
| + wm::GetWindowVisibilityAnimationDuration(*window_)) {
|
| + wm::SetWindowVisibilityAnimationType(
|
| window_,
|
| - views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
|
| - views::corewm::SetWindowVisibilityAnimationDuration(
|
| + wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
|
| + wm::SetWindowVisibilityAnimationDuration(
|
| window_,
|
| base::TimeDelta::FromMilliseconds(animation_time_in_ms));
|
| }
|
|
|
| ~AnimationSetter() {
|
| - views::corewm::SetWindowVisibilityAnimationType(window_,
|
| + wm::SetWindowVisibilityAnimationType(window_,
|
| previous_animation_type_);
|
| - views::corewm::SetWindowVisibilityAnimationDuration(
|
| + wm::SetWindowVisibilityAnimationDuration(
|
| window_,
|
| previous_animation_time_);
|
| }
|
| @@ -296,7 +296,7 @@ void MultiUserWindowManagerChromeOS::SetWindowOwner(
|
|
|
| // Add observers to track state changes.
|
| window->AddObserver(this);
|
| - views::corewm::TransientWindowManager::Get(window)->AddObserver(this);
|
| + wm::TransientWindowManager::Get(window)->AddObserver(this);
|
|
|
| // Check if this window was created due to a user interaction. If it was,
|
| // transfer it to the current user.
|
| @@ -444,7 +444,7 @@ void MultiUserWindowManagerChromeOS::OnWindowDestroyed(aura::Window* window) {
|
| RemoveTransientOwnerRecursive(window);
|
| return;
|
| }
|
| - views::corewm::TransientWindowManager::Get(window)->RemoveObserver(this);
|
| + wm::TransientWindowManager::Get(window)->RemoveObserver(this);
|
| // Remove the window from the owners list.
|
| delete window_to_entry_[window];
|
| window_to_entry_.erase(window);
|
| @@ -769,8 +769,8 @@ void MultiUserWindowManagerChromeOS::SetWindowVisibility(
|
| void MultiUserWindowManagerChromeOS::ShowWithTransientChildrenRecursive(
|
| aura::Window* window, int animation_time_in_ms) {
|
| aura::Window::Windows::const_iterator it =
|
| - views::corewm::GetTransientChildren(window).begin();
|
| - for (; it != views::corewm::GetTransientChildren(window).end(); ++it)
|
| + wm::GetTransientChildren(window).begin();
|
| + for (; it != wm::GetTransientChildren(window).end(); ++it)
|
| ShowWithTransientChildrenRecursive(*it, animation_time_in_ms);
|
|
|
| // We show all children which were not explicitly hidden.
|
| @@ -784,11 +784,11 @@ aura::Window* MultiUserWindowManagerChromeOS::GetOwningWindowInTransientChain(
|
| aura::Window* window) {
|
| if (!GetWindowOwner(window).empty())
|
| return NULL;
|
| - aura::Window* parent = views::corewm::GetTransientParent(window);
|
| + aura::Window* parent = wm::GetTransientParent(window);
|
| while (parent) {
|
| if (!GetWindowOwner(parent).empty())
|
| return parent;
|
| - parent = views::corewm::GetTransientParent(parent);
|
| + parent = wm::GetTransientParent(parent);
|
| }
|
| return NULL;
|
| }
|
| @@ -798,8 +798,8 @@ void MultiUserWindowManagerChromeOS::AddTransientOwnerRecursive(
|
| aura::Window* owned_parent) {
|
| // First add all child windows.
|
| aura::Window::Windows::const_iterator it =
|
| - views::corewm::GetTransientChildren(window).begin();
|
| - for (; it != views::corewm::GetTransientChildren(window).end(); ++it)
|
| + wm::GetTransientChildren(window).begin();
|
| + for (; it != wm::GetTransientChildren(window).end(); ++it)
|
| AddTransientOwnerRecursive(*it, owned_parent);
|
|
|
| // If this window is the owned window, we do not have to handle it again.
|
| @@ -813,7 +813,7 @@ void MultiUserWindowManagerChromeOS::AddTransientOwnerRecursive(
|
|
|
| // Add observers to track state changes.
|
| window->AddObserver(this);
|
| - views::corewm::TransientWindowManager::Get(window)->AddObserver(this);
|
| + wm::TransientWindowManager::Get(window)->AddObserver(this);
|
|
|
| // Hide the window if it should not be shown. Note that this hide operation
|
| // will hide recursively this and all children - but we have already collected
|
| @@ -826,8 +826,8 @@ void MultiUserWindowManagerChromeOS::RemoveTransientOwnerRecursive(
|
| aura::Window* window) {
|
| // First remove all child windows.
|
| aura::Window::Windows::const_iterator it =
|
| - views::corewm::GetTransientChildren(window).begin();
|
| - for (; it != views::corewm::GetTransientChildren(window).end(); ++it)
|
| + wm::GetTransientChildren(window).begin();
|
| + for (; it != wm::GetTransientChildren(window).end(); ++it)
|
| RemoveTransientOwnerRecursive(*it);
|
|
|
| // Find from transient window storage the visibility for the given window,
|
| @@ -837,7 +837,7 @@ void MultiUserWindowManagerChromeOS::RemoveTransientOwnerRecursive(
|
| DCHECK(visibility_item != transient_window_to_visibility_.end());
|
|
|
| window->RemoveObserver(this);
|
| - views::corewm::TransientWindowManager::Get(window)->RemoveObserver(this);
|
| + wm::TransientWindowManager::Get(window)->RemoveObserver(this);
|
|
|
| bool unowned_view_state = visibility_item->second;
|
| transient_window_to_visibility_.erase(visibility_item);
|
|
|