| 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/workspace_controller.h" | 5 #include "ash/wm/workspace_controller.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/aura/wm_window_aura.h" | 9 #include "ash/aura/wm_window_aura.h" |
| 10 #include "ash/common/shell_window_ids.h" | 10 #include "ash/common/shell_window_ids.h" |
| 11 #include "ash/common/wm/window_animation_types.h" |
| 11 #include "ash/common/wm/window_state.h" | 12 #include "ash/common/wm/window_state.h" |
| 12 #include "ash/common/wm/workspace/workspace_layout_manager.h" | 13 #include "ash/common/wm/workspace/workspace_layout_manager.h" |
| 13 #include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h" | 14 #include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h" |
| 14 #include "ash/common/wm/workspace/workspace_layout_manager_delegate.h" | 15 #include "ash/common/wm/workspace/workspace_layout_manager_delegate.h" |
| 15 #include "ash/root_window_controller.h" | 16 #include "ash/root_window_controller.h" |
| 16 #include "ash/shelf/shelf_layout_manager.h" | 17 #include "ash/shelf/shelf_layout_manager.h" |
| 17 #include "ash/shell.h" | 18 #include "ash/shell.h" |
| 18 #include "ash/wm/window_animations.h" | 19 #include "ash/wm/window_animations.h" |
| 19 #include "ash/wm/window_state_aura.h" | 20 #include "ash/wm/window_state_aura.h" |
| 20 #include "ash/wm/window_util.h" | 21 #include "ash/wm/window_util.h" |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 | 130 |
| 130 settings.SetPreemptionStrategy(ui::LayerAnimator::ENQUEUE_NEW_ANIMATION); | 131 settings.SetPreemptionStrategy(ui::LayerAnimator::ENQUEUE_NEW_ANIMATION); |
| 131 viewport_->layer()->GetAnimator()->SchedulePauseForProperties( | 132 viewport_->layer()->GetAnimator()->SchedulePauseForProperties( |
| 132 base::TimeDelta::FromMilliseconds(kInitialPauseTimeMS), | 133 base::TimeDelta::FromMilliseconds(kInitialPauseTimeMS), |
| 133 ui::LayerAnimationElement::TRANSFORM | | 134 ui::LayerAnimationElement::TRANSFORM | |
| 134 ui::LayerAnimationElement::OPACITY | | 135 ui::LayerAnimationElement::OPACITY | |
| 135 ui::LayerAnimationElement::BRIGHTNESS | | 136 ui::LayerAnimationElement::BRIGHTNESS | |
| 136 ui::LayerAnimationElement::VISIBILITY); | 137 ui::LayerAnimationElement::VISIBILITY); |
| 137 settings.SetTweenType(gfx::Tween::EASE_OUT); | 138 settings.SetTweenType(gfx::Tween::EASE_OUT); |
| 138 settings.SetTransitionDuration( | 139 settings.SetTransitionDuration( |
| 139 base::TimeDelta::FromMilliseconds(kCrossFadeDurationMS)); | 140 base::TimeDelta::FromMilliseconds(wm::kCrossFadeDurationMS)); |
| 140 viewport_->layer()->SetTransform(gfx::Transform()); | 141 viewport_->layer()->SetTransform(gfx::Transform()); |
| 141 viewport_->layer()->SetOpacity(1.0f); | 142 viewport_->layer()->SetOpacity(1.0f); |
| 142 } | 143 } |
| 143 } | 144 } |
| 144 | 145 |
| 145 void WorkspaceController::SetMaximizeBackdropDelegate( | 146 void WorkspaceController::SetMaximizeBackdropDelegate( |
| 146 std::unique_ptr<WorkspaceLayoutManagerBackdropDelegate> delegate) { | 147 std::unique_ptr<WorkspaceLayoutManagerBackdropDelegate> delegate) { |
| 147 layout_manager_->SetMaximizeBackdropDelegate(std::move(delegate)); | 148 layout_manager_->SetMaximizeBackdropDelegate(std::move(delegate)); |
| 148 } | 149 } |
| 149 | 150 |
| 150 } // namespace ash | 151 } // namespace ash |
| OLD | NEW |