| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/wm/panels/panel_layout_manager.h" | 5 #include "ash/wm/panels/panel_layout_manager.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <map> | 8 #include <map> |
| 9 | 9 |
| 10 #include "ash/screen_util.h" | 10 #include "ash/screen_util.h" |
| (...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 538 wm::GetWindowState(iter->window)->Minimize(); | 538 wm::GetWindowState(iter->window)->Minimize(); |
| 539 } | 539 } |
| 540 } | 540 } |
| 541 restore_windows_on_shelf_visible_ = minimized_windows.Pass(); | 541 restore_windows_on_shelf_visible_ = minimized_windows.Pass(); |
| 542 } | 542 } |
| 543 | 543 |
| 544 //////////////////////////////////////////////////////////////////////////////// | 544 //////////////////////////////////////////////////////////////////////////////// |
| 545 // PanelLayoutManager private implementation: | 545 // PanelLayoutManager private implementation: |
| 546 | 546 |
| 547 void PanelLayoutManager::MinimizePanel(aura::Window* panel) { | 547 void PanelLayoutManager::MinimizePanel(aura::Window* panel) { |
| 548 views::corewm::SetWindowVisibilityAnimationType( | 548 ::wm::SetWindowVisibilityAnimationType( |
| 549 panel, WINDOW_VISIBILITY_ANIMATION_TYPE_MINIMIZE); | 549 panel, WINDOW_VISIBILITY_ANIMATION_TYPE_MINIMIZE); |
| 550 ui::Layer* layer = panel->layer(); | 550 ui::Layer* layer = panel->layer(); |
| 551 ui::ScopedLayerAnimationSettings panel_slide_settings(layer->GetAnimator()); | 551 ui::ScopedLayerAnimationSettings panel_slide_settings(layer->GetAnimator()); |
| 552 panel_slide_settings.SetPreemptionStrategy( | 552 panel_slide_settings.SetPreemptionStrategy( |
| 553 ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET); | 553 ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET); |
| 554 panel_slide_settings.SetTransitionDuration( | 554 panel_slide_settings.SetTransitionDuration( |
| 555 base::TimeDelta::FromMilliseconds(kPanelSlideDurationMilliseconds)); | 555 base::TimeDelta::FromMilliseconds(kPanelSlideDurationMilliseconds)); |
| 556 gfx::Rect bounds(panel->bounds()); | 556 gfx::Rect bounds(panel->bounds()); |
| 557 bounds.Offset(GetSlideInAnimationOffset( | 557 bounds.Offset(GetSlideInAnimationOffset( |
| 558 shelf_->shelf_widget()->GetAlignment())); | 558 shelf_->shelf_widget()->GetAlignment())); |
| (...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 886 | 886 |
| 887 void PanelLayoutManager::OnKeyboardBoundsChanging( | 887 void PanelLayoutManager::OnKeyboardBoundsChanging( |
| 888 const gfx::Rect& keyboard_bounds) { | 888 const gfx::Rect& keyboard_bounds) { |
| 889 // This bounds change will have caused a change to the Shelf which does not | 889 // This bounds change will have caused a change to the Shelf which does not |
| 890 // propogate automatically to this class, so manually recalculate bounds. | 890 // propogate automatically to this class, so manually recalculate bounds. |
| 891 OnWindowResized(); | 891 OnWindowResized(); |
| 892 } | 892 } |
| 893 | 893 |
| 894 } // namespace internal | 894 } // namespace internal |
| 895 } // namespace ash | 895 } // namespace ash |
| OLD | NEW |