diff options
Diffstat (limited to 'ash/wm/dock/docked_window_layout_manager.cc')
| -rw-r--r-- | ash/wm/dock/docked_window_layout_manager.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ash/wm/dock/docked_window_layout_manager.cc b/ash/wm/dock/docked_window_layout_manager.cc index 63ad210..d81c34a 100644 --- a/ash/wm/dock/docked_window_layout_manager.cc +++ b/ash/wm/dock/docked_window_layout_manager.cc @@ -221,7 +221,7 @@ namespace { // Returns true if a window is a popup or a transient child. bool IsPopupOrTransient(const aura::Window* window) { return (window->type() == ui::wm::WINDOW_TYPE_POPUP || - ::wm::GetTransientParent(window)); + views::corewm::GetTransientParent(window)); } // Certain windows (minimized, hidden or popups) do not matter to docking. @@ -834,15 +834,15 @@ void DockedWindowLayoutManager::OnWindowVisibilityChanging( aura::Window* window, bool visible) { if (IsPopupOrTransient(window)) return; - int animation_type = ::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_DEFAULT; + int animation_type = views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_DEFAULT; if (visible) { - animation_type = ::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_DROP; - ::wm::SetWindowVisibilityAnimationDuration( + animation_type = views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_DROP; + views::corewm::SetWindowVisibilityAnimationDuration( window, base::TimeDelta::FromMilliseconds(kFadeDurationMs)); } else if (wm::GetWindowState(window)->IsMinimized()) { animation_type = WINDOW_VISIBILITY_ANIMATION_TYPE_MINIMIZE; } - ::wm::SetWindowVisibilityAnimationType(window, animation_type); + views::corewm::SetWindowVisibilityAnimationType(window, animation_type); } void DockedWindowLayoutManager::OnWindowDestroying(aura::Window* window) { |